diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
index 7f29640ceb..3e0bb172e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
@@ -29,10 +29,18 @@
     [%~ END ~%]
     [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
         <li class="patroncity">
-            <span class="city">[%~ patron.city |html ~%]</span>[%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%],[% END ~%]<span class="state">[% patron.state |html ~%]</span>[%~ END ~%]
-            [%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%]
-                <span class="comma">,</span>
-            [% END ~%]<span class="country">[% patron.country |html ~%]</span>[%~ END ~%]
+            <span class="city">[%~ patron.city |html ~%]</span>
+            [%~ IF ( patron.state ) %]
+                [%~ IF ( patron.city ) ~%]
+                    ,
+                [% END ~%]
+                <span class="state">[% patron.state |html ~%]</span>
+            [%~ END ~%]
+            [%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %]
+            [%~ IF ( patron.country ) %]
+                [% line_break | $raw %]
+                <span class="country">[% patron.country |html ~%]</span>
+            [%~ END ~%]
         </li>
     [%~ END ~%]
 [%~ END ~%]
@@ -44,11 +52,15 @@
             [%~ IF patron.streettype ~%]
                 [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
             [%~ END ~%]
-            <li class="patronaddress1"
-                ><span class="address1">[%~ patron.address | html ~%]</span>[%~ IF roadtype_desc %]<span class="roadtype">[% roadtype_desc | html ~%]</span>[%~ END ~%][%~ IF patron.streetnumber %]
+            <li class="patronaddress1">
+                <span class="address1">[%~ patron.address | html ~%]</span>
+                [%~ IF roadtype_desc %]
+                    <span class="roadtype">[% roadtype_desc | html ~%]</span>
+                [%~ END ~%]
+                [%~ IF patron.streetnumber %]
                     <span class="streetnumber">[% patron.streetnumber | html ~%]</span>
-                [%~ END ~%]</li
-            >
+                [%~ END ~%]
+            </li>
         [%~ END ~%]
         [%~ IF ( patron.address2 ) ~%]
             <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
@@ -56,7 +68,11 @@
     [%~ END ~%]
     [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
         <li class="patroncity">
-            [%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span>[% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%]
+            [%~ IF ( patron.zipcode ) ~%]
+                <span class="zipcode">[%~ patron.zipcode | html %]</span>
+            [% END ~%]
+            <span class="city">[%~ patron.city | html ~%]</span>
+            [%~ IF ( patron.state ) ~%]
                 [% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
             [%~ END ~%]
             [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
@@ -71,9 +87,13 @@
             [%~ IF patron.streettype ~%]
                 [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
             [%~ END ~%]
-            <li class="patronaddress1"
-                >[%~ IF patron.streetnumber ~%]<span class="streetnumber">[%~ patron.streetnumber | html %]</span>[% END ~%]
-                [%~ IF roadtype_desc ~%]<span class="roadtype">[%~ roadtype_desc | html %]</span>[% END ~%]
+            <li class="patronaddress1">
+                [%~ IF patron.streetnumber ~%]
+                    <span class="streetnumber">[%~ patron.streetnumber | html %]</span>
+                [% END ~%]
+                [%~ IF roadtype_desc ~%]
+                    <span class="roadtype">[%~ roadtype_desc | html %]</span>
+                [% END ~%]
                 <span class="address1">[%~ patron.address | html ~%]</span>
             </li>
         [%~ END ~%]
@@ -83,7 +103,11 @@
     [%~ END ~%]
     [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
         <li class="patroncity">
-            [%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span>[% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%]
+            [%~ IF ( patron.zipcode ) ~%]
+                <span class="zipcode">[%~ patron.zipcode | html %]</span>
+            [% END ~%]
+            <span class="city">[%~ patron.city | html ~%]</span>
+            [%~ IF ( patron.state ) ~%]
                 [% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
             [%~ END ~%]
             [%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]