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 7161ca7a3b..5c75ec72ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
@@ -64,18 +64,24 @@
     [%- IF display_patron_name -%]
         [%- IF data.category_type == 'I' -%]
             [%- WRAPPER maybe_span field_name = 'surname' -%][%- data.surname | html -%][%- END -%]
-            [%- IF data.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])[%- END -%]
+            [%- IF data.othernames -%]
+                ([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])
+            [%- END -%]
         [%- ELSIF invert_name -%]
             [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
             [%- WRAPPER maybe_span field_name='surname' -%][%- data.surname | html -%][%- END -%]
             [%- IF ( data.preferred_name ) -%], [%- WRAPPER maybe_span field_name='preferred_name' -%][% data.preferred_name | html -%][%- END -%][%- END -%]
             [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
-            [%- IF data.othernames -%]([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])[%- END -%]
+            [%- IF data.othernames -%]
+                ([%- WRAPPER maybe_span field_name='othernames' -%][%- data.othernames | html -%][%- END -%])
+            [%- END -%]
         [%- ELSE -%]
             [%- UNLESS no_title %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
             [%- WRAPPER maybe_span field_name='preferred_name' -%][%- data.preferred_name | html %][% END -%]
             [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
-            [%- IF data.othernames -%][%- WRAPPER maybe_span field_name='othernames' -%][%- ' (' _ data.othernames _ ')' | html -%][%- END -%][%- END -%]
+            [%- IF data.othernames -%]
+                [%- WRAPPER maybe_span field_name='othernames' -%][%- ' (' _ data.othernames _ ')' | html -%][%- END -%]
+            [%- END -%]
             [%- WRAPPER maybe_span field_name='surname' -%][% ' ' _ data.surname | html -%][%- END -%]
         [%- END -%]
         [%- IF display_cardnumber AND data.cardnumber -%][%- WRAPPER maybe_span field_name='cardnumber' -%][%- ' (' _ data.cardnumber _ ')' | html -%][%- END -%][%- END -%]
@@ -89,9 +95,6 @@
     [%- END -%]
 [% END %]
 [%- BLOCK maybe_span -%]
-    [%- IF no_html -%]
-        [%- content | $raw #filtered before passed in -%]
-    [%- ELSE -%]
-        <span class="[% field_name | html %]">[%- content | $raw #filtered before passed in -%]</span>
-    [%- END -%]
+    [%- # All on one line to prevent unwanted whitespace -%]
+    [%- IF no_html -%][%- content | $raw #filtered before passed in -%][%- ELSE -%]<span class="[% field_name | html %]">[%- content | $raw #filtered before passed in -%]</span>[%- END -%]
 [%- END -%]