diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
index 28a9ce3503..f31f379d84 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
@@ -147,9 +147,7 @@
                 <label for="B_city">
             [% END %]
             City: </label>
-            <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city | html %]" />
             [% IF cities.count %]
-                or choose
                 <select class="select_city" data-addressfield="B_" name="select_city">
                     <option value="|||"></option>
                     [% FOREACH c IN cities %]
@@ -162,7 +160,9 @@
                         </option>
                     [% END %]
                 </select>
+                <span class="hint">or enter</span>
             [% END %]
+            <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city | html %]" />
             [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
         </li>
     [% END %]
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 875699a969..2ff1a84f65 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
@@ -132,8 +132,7 @@
                 <label for="altcontactaddress3">
             [% END %]
             City:</label>
-            <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
-            [% IF cities.count %]or choose
+            [% IF cities.count %]
                 <select class="select_city" data-addressfield="altcontact" name="select_city">
                     <option value="|||"></option>
                     [% FOREACH c IN cities %]
@@ -146,7 +145,9 @@
                         </option>
                     [% END %]
                 </select>
+                <span class="hint">or enter</span>
             [% END %]
+            <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" />
             [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
         </li>
     [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
index 1c40b1b73a..8ed3792d91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
@@ -138,9 +138,7 @@
                 <label for="city">
             [% END %]
             City: </label>
-            <input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
             [% IF cities.count %]
-                or choose
                 <select class="select_city" data-addressfield="" name="select_city">
                     <option value="|||"></option>
                     [% FOREACH c IN cities %]
@@ -153,7 +151,9 @@
                         </option>
                     [% END %]
                 </select>
+                <span class="hint">or enter</span>
             [% END %]
+            <input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
             [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
         </li>
     [% END %]