diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
index 72d4472a83..3cafa9aa91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
@@ -59,29 +59,29 @@
     [%- END -%]
 [%- END -%]
 [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
-    [%- IF link_to == 'circulation_reserves' -%]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[%- data.borrowernumber | uri -%]#reserves">
-    [%- ELSIF link_to == 'circulation_recalls' -%]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[%- data.borrowernumber | uri -%]#recalls">
-    [%- ELSIF link_to == 'members_pay' -%]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[%- patron.borrowernumber | uri -%]">
-    [%- ELSE -%]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[%- data.borrowernumber | uri -%]">
-    [%- END -%]
-[%- END -%]
-[%- IF display_patron_name -%]
-    [%- IF data.category_type == 'I' -%]
-        [%- data.surname | html -%] [%- IF data.othernames -%] ([%- data.othernames | html -%])[%- END -%]
-    [%- ELSIF invert_name -%]
-        [%- data.title | $raw -%][%- data.surname | html -%][%- IF ( data.preferred_name ) -%], [% data.preferred_name | html -%][%- END -%][%- IF data.middle_name -%] [% data.middle_name | html -%][%- END -%][%- IF data.othernames -%] ([%- data.othernames | html -%])[%- END -%]
-    [%- ELSE -%]
-        [%- data.title | $raw -%][%- data.preferred_name | html %][%- IF data.middle_name -%] [% data.middle_name | html -%][%- END -%][%- IF data.othernames -%] ([%- data.othernames | html -%]) [%- END -%] [% data.surname | html -%]
-    [%- END -%]
-    [%- IF display_cardnumber AND data.cardnumber -%] ([%- data.cardnumber | html -%])[%- END -%]
-[%- ELSIF display_cardnumber -%]
-    [%- IF data.cardnumber -%][%# FIXME Cardnumber should always be defined, right? -%]
-        [%- data.cardnumber | html -%]
+    [%- IF link_to == 'circulation_reserves' -%]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[%- data.borrowernumber | uri -%]#reserves">[%- PROCESS display_patron_name -%]</a>
+    [%- ELSIF link_to == 'circulation_recalls' -%]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[%- data.borrowernumber | uri -%]#recalls">[%- PROCESS display_patron_name -%]</a>
+    [%- ELSIF link_to == 'members_pay' -%]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[%- patron.borrowernumber | uri -%]">[%- PROCESS display_patron_name -%]</a>
+    [%- ELSE -%]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[%- data.borrowernumber | uri -%]">[%- PROCESS display_patron_name -%]</a>
     [%- END -%]
 [%- ELSE -%]
-    <span>A patron from library [%- Branches.GetName( patron.branchcode ) | html -%]</span>
-[%- END -%]
-
-[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
-    </a>
+    [%- PROCESS display_patron_name -%]
 [%- END -%]
+[%- BLOCK display_patron_name -%]
+    [%- IF display_patron_name -%]
+        [%- IF data.category_type == 'I' -%]
+            [%- data.surname | html -%] [%- IF data.othernames -%] ([%- data.othernames | html -%])[%- END -%]
+        [%- ELSIF invert_name -%]
+            [%- data.title | $raw -%][%- data.surname | html -%][%- IF ( data.preferred_name ) -%], [% data.preferred_name | html -%][%- END -%][%- IF data.middle_name -%] [% data.middle_name | html -%][%- END -%][%- IF data.othernames -%] ([%- data.othernames | html -%])[%- END -%]
+        [%- ELSE -%]
+            [%- data.title | $raw -%][%- data.preferred_name | html %][%- IF data.middle_name -%] [% data.middle_name | html -%][%- END -%][%- IF data.othernames -%] ([%- data.othernames | html -%]) [%- END -%] [% data.surname | html -%]
+        [%- END -%]
+        [%- IF display_cardnumber AND data.cardnumber -%] ([%- data.cardnumber | html -%])[%- END -%]
+    [%- ELSIF display_cardnumber -%]
+        [%- IF data.cardnumber -%][%# FIXME Cardnumber should always be defined, right? -%]
+            [%- data.cardnumber | html -%]
+        [%- END -%]
+    [%- ELSE -%]
+        <span>A patron from library [%- Branches.GetName( patron.branchcode ) | html -%]</span>
+    [%- END -%]
+[% END %]