diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc
index 3d75331188..9b42838c48 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc
@@ -1,12 +1,16 @@
 [%- IF patron.category.category_type == 'I' -%]
-    <span class="surname">[% patron.surname | html %]</span>[% IF patron.othernames %]<span class="othername">([% ' ' _ patron.othernames | html %])</span>[%- END -%]
+    [%- WRAPPER maybe_span field_name = 'surname' -%][%- patron.surname | html -%][%- END -%]
+    [%- IF patron.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- patron.othernames | html -%][%- END -%])[%- END -%]
 [%- ELSE -%]
-    [%- IF patron.title -%]
-        [%- IF no_html -%]
-            [% patron.title | html %]
-        [%- ELSE -%]
-            <span class="patron-title"></span>
-        [%- END -%]
-    [%- END -%]
-    <span class="preferred_name">[% patron.preferred_name | html %]</span> <span class="middle_name">[% patron.middle_name | html %]</span> <span class="surname">[% patron.surname | html %] </span>
+    [%- WRAPPER maybe_span field_name='patron-title' -%][%- patron.title _ ' ' | html %][% END -%]
+    [%- WRAPPER maybe_span field_name='preferred_name' -%][%- patron.preferred_name | html %][% END -%]
+    [%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ patron.middle_name | html -%][%- END -%]
+    [%- WRAPPER maybe_span field_name='surname' -%][% ' ' _ patron.surname | html -%][%- END -%]
+[%- END -%]
+[%- BLOCK maybe_span -%]
+    [%- IF no_html -%]
+        [%- content | html -%]
+    [%- ELSE -%]
+        <span class="[% field_name | html %]">[%- content | html -%]</span>
+    [%- END -%]
 [%- END -%]