diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 30c18d6449..84a6a6575b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -16,8 +16,7 @@
             [% ELSE %]
                 Modify patron
             [% END %]
-            [% IF (firstname) %][% firstname | html %] [% END %]
-            [% IF (surname) %][% surname | html %] [% END %]
+            [% INCLUDE 'patron-title.inc' no_html = 1 %]
             ([% IF categoryname -%]
                 [%- categoryname | html -%]
             [%- ELSE -%]
@@ -43,8 +42,7 @@
             ›
             [% IF (firstname || surname ) %]
                 <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">
-                    [% IF (firstname) %][% firstname | html %] [% END %]
-                    [% IF (surname) %][% surname | html %] [% END %]
+                    [% INCLUDE 'patron-title.inc' %]
                 </a>  &rsaquo;
             [% END %]
             <strong>
@@ -100,8 +98,7 @@
                             [% ELSE %]
                                 Modify patron
                             [% END %]
-                            [% IF (firstname) %][% firstname | html %] [% END %]
-                            [% IF (surname) %][% surname | html %] [% END %]
+                            [% INCLUDE 'patron-title.inc' %]
                             ([%IF categoryname %]
                                 [% categoryname | html %]
                             [% ELSE %]