diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index a8328bca4a..c61b0cf22c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -27,11 +27,10 @@
[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
- [% SWITCH Koha.Preference( 'AddressFormat' ) %]
- [% CASE 'de' %]
- [% INCLUDE 'member-display-address-style-de.inc' %]
- [% CASE # us %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index c762d9eae1..6cf5b38bbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -427,6 +427,8 @@
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-main-address-style-us.inc' %]
[% END %]
[% END # nostreet && nocity etc group%]
@@ -516,23 +518,20 @@
[% IF ( step_6 ) %]
[% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
- [% SWITCH Koha.Preference( 'AddressFormat' ) %]
- [% CASE 'de' %]
- [% INCLUDE 'member-alt-address-style-de.inc' %]
- [% CASE # us %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
[% INCLUDE 'member-alt-address-style-us.inc' %]
- [% END %]
-
+ [% END %]
[% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
[% END %]
[% IF ( step_2 ) %]
[% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
- [% SWITCH Koha.Preference( 'AddressFormat' ) %]
- [% CASE 'de' %]
- [% INCLUDE 'member-alt-contact-style-de.inc' %]
- [% CASE # us %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
[% INCLUDE 'member-alt-contact-style-us.inc' %]
- [% END %]
+ [% END %]
[% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
[% END %]