diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
index c2b3cbb092..3fe7290dea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
@@ -54,12 +54,7 @@
 [% BLOCK 'alt-contact-style_altcontactsurname' %]
     [% UNLESS noaltcontactsurname %]
         <li>
-            [% IF ( mandatoryaltcontactsurname ) %]
-                <label for="altcontactsurname" class="required">
-            [% ELSE %]
-                <label for="altcontactsurname">
-            [% END %]
-            Surname: </label>
+            <label for="altcontactsurname" [% IF mandatoryaltcontactsurname %]class="required"[% END %]>Surname: </label>
             <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" />
             [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
         </li>
@@ -69,12 +64,7 @@
 [% BLOCK 'alt-contact-style_altcontactfirstname' %]
     [% UNLESS noaltcontactfirstname %]
         <li>
-            [% IF ( mandatoryaltcontactfirstname ) %]
-                <label for="altcontactfirstname" class="required">
-            [% ELSE %]
-                <label for="altcontactfirstname">
-            [% END %]
-            First name: </label>
+            <label for="altcontactfirstname" [% IF mandatoryaltcontactfirstname %]class="required"[% END %]>First name: </label>
             <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" />
             [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
         </li>
@@ -84,12 +74,7 @@
 [% BLOCK 'alt-contact-style_altcontactaddress1' %]
     [% UNLESS noaltcontactaddress1 %]
         <li>
-            [% IF ( mandatoryaltcontactaddress1 ) %]
-                <label for="altcontactaddress1" class="required">
-            [% ELSE %]
-                <label for="altcontactaddress1">
-            [% END %]
-            Address: </label>
+            <label for="altcontactaddress1" [% IF mandatoryaltcontactaddress1 %]class="required"[% END %]>Address: </label>
             <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" />
             [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
         </li>
@@ -99,12 +84,7 @@
 [% BLOCK 'alt-contact-style_altcontactaddress2' %]
     [% UNLESS noaltcontactaddress2 %]
         <li>
-            [% IF ( mandatoryaltcontactaddress2 ) %]
-                <label for="altcontactaddress2" class="required">
-            [% ELSE %]
-                <label for="altcontactaddress2">
-            [% END %]
-            Address 2: </label>
+            <label for="altcontactaddress2" [% IF mandatoryaltcontactaddress2 %]class="required"[% END %]>Address 2: </label>
             <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" />
             [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
         </li>
@@ -114,13 +94,8 @@
 [% BLOCK 'alt-contact-style_altcontactzipcode' %]
     [% UNLESS noaltcontactzipcode %]
         <li>
-            [% IF ( mandatoryaltcontactzipcode ) %]
-                <label for="altcontactzipcode" class="required">
-            [% ELSE %]
-                <label for="altcontactzipcode">
-            [% END %]
-            ZIP/Postal code: </label>
-<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
+            <label for="altcontactzipcode" [% IF mandatoryaltcontactzipcode %]class="required"[% END %]>ZIP/Postal code: </label>
+            <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" />
             [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
         </li>
     [% END %]
@@ -129,21 +104,17 @@
 [% BLOCK 'alt-contact-style_altcontactaddress3' %]
     [% UNLESS noaltcontactaddress3 %]
         <li>
-            [% IF ( mandatoryaltcontactaddress3 ) %]
-                <label for="altcontactaddress3" class="required">
-            [% ELSE %]
-                <label for="altcontactaddress3">
-            [% END %]
-            City: </label>
+            <label for="altcontactaddress3" [% IF mandatoryaltcontactaddress3 %]class="required"[% END %]>City: </label>
             [% IF cities.count %]
                 <select class="select_city" data-addressfield="altcontact" name="select_city">
                     <option value="|||"></option>
                     [% FOREACH c IN cities %]
+                        [% SET option_value = c.city_zipcode _ '|' _ c.city_name _ '|' _ c.city_state _ '|' _ c.city_country %]
+                        [% SET option_selected = 0 %]
                         [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %]
-                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
-                        [% ELSE %]
-                        <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
+                            [% option_selected = 1 %]
                         [% END %]
+                        <option value="[% option_value | html %]" [% IF option_selected %]selected="selected"[% END %]>
                             [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
                         </option>
                     [% END %]
@@ -159,12 +130,7 @@
 [% BLOCK 'alt-contact-style_altcontactstate' %]
     [% UNLESS noaltcontactstate %]
         <li>
-            [% IF ( mandatoryaltcontactstate ) %]
-                <label for="altcontactstate" class="required">
-            [% ELSE %]
-                <label for="altcontactstate">
-            [% END %]
-            State: </label>
+            <label for="altcontactstate" [% IF mandatoryaltcontactstate %]class="required"[% END %]>State: </label>
             <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" />
             [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
         </li>
@@ -174,12 +140,7 @@
 [% BLOCK 'alt-contact-style_altcontactcountry' %]
     [% UNLESS noaltcontactcountry %]
         <li>
-            [% IF ( mandatoryaltcontactcountry ) %]
-                <label for="altcontactcountry" class="required">
-            [% ELSE %]
-                <label for="altcontactcountry">
-            [% END %]
-            Country: </label>
+            <label for="altcontactcountry" [% IF mandatoryaltcontactcountry %]class="required"[% END %]>Country: </label>
             <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" />
             [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
         </li>
@@ -189,12 +150,7 @@
 [% BLOCK 'alt-contact-style_altcontactphone' %]
     [% UNLESS noaltcontactphone %]
         <li>
-            [% IF ( mandatoryaltcontactphone ) %]
-                <label for="altcontactphone" class="required">
-            [% ELSE %]
-                <label for="altcontactphone">
-            [% END %]
-            Phone: </label>
+            <label for="altcontactphone" [% IF mandatoryaltcontactphone %]class="required"[% END %]>Phone: </label>
             <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" />
             [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
         </li>