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 65565629e3..6ae7cb618b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -12,19 +12,21 @@
[% END %]
[% END %]
- [% IF ( address ) %]
- [% address %]
+ [% IF ( address or address2 ) %]
+ [% IF ( address ) %]
+ [% address %]
+ [% END %]
+ [% IF ( address2 ) %]
+ [% address2 %]
+ [% END %]
[% ELSE %]
- No address stored.
- [% END %]
- [% IF ( address2 ) %]
- [% address2 %]
- [% END %]
+ No address stored.
+ [% END %]
[% IF ( city ) %]
[% city %][% IF ( state ) %], [% state %][% END %]
[% zipcode %][% IF ( country ) %], [% country %][% END %]
[% ELSE %]
- No city stored.
+ No city stored.
[% END %]
[% IF ( phone ) %]
[% phone %]
@@ -35,7 +37,7 @@
[% IF ( phonepro ) %]
[% phonepro %]
[% ELSE %]
- No phone stored.
+ No phone stored.
[% END %]
[% END %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index fe04b63cba..451cd980cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -14,19 +14,22 @@ in the global namespace %]
[% END %]
[% END %]
- [% IF borrower.address %]
- [% borrower.address %]
+ [% IF ( borrower.address or borrower.address2 ) %]
+ [% IF ( borrower.address ) %]
+ [% borrower.address %]
+ [% END %]
+ [% IF ( borrower.address2 ) %]
+ [% borrower.address2 %]
+ [% END %]
[% ELSE %]
- No address stored.
- [% END %]
- [% IF borrower.address2 %]
- [% borrower.address2 %]
- [% END %]
+ No address stored.
+ [% END %]
+
[% IF borrower.city %]
[% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
[% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
[% ELSE %]
- No city stored.
+ No city stored.
[% END %]
[% IF borrower.phone %]
[% borrower.phone %]
@@ -37,7 +40,7 @@ in the global namespace %]
[% IF borrower.phonepro %]
[% borrower.phonepro %]
[% ELSE %]
- No phone stored.
+ No phone stored.
[% END %]
[% END %]
[% END %]