diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
new file mode 100644
index 0000000000..e0fdc2a6ae
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
@@ -0,0 +1,11 @@
+[% IF ( no_add ) %]
+
+
Cannot add patron
+ [% IF ( no_branches ) %]
+
There are no libraries defined. [% IF ( CAN_user_parameters ) %]Please add a library.[% ELSE %]An administrator must define at least one library.[% END %]
+ [% END %]
+ [% IF ( no_categories ) %]
+
There are no patron categories defined. [% IF ( CAN_user_parameters ) %]Please add a patron category.[% ELSE %]An administrator must define at least one patron category.[% END %]
+ [% END %]
+
+[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 06fbc75bb9..b1496544ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -334,17 +334,8 @@ function filterByFirstLetterSurname(letter) {
[% END %]
[% INCLUDE 'patron-toolbar.inc' %]
- [% IF ( no_add ) %]
-
-
Cannot add patron
- [% IF ( no_branches ) %]
-
There are no libraries defined. [% IF ( CAN_user_parameters ) %]Please add a library.[% ELSE %]An administrator must define at least one library.[% END %]
- [% END %]
- [% IF ( no_categories ) %]
-
There are no patron categories defined. [% IF ( CAN_user_parameters ) %]Please add a patron category.[% ELSE %]An administrator must define at least one patron category.[% END %]
- [% END %]
-
- [% END %]
+ [% INCLUDE 'noadd-warnings.inc' %]
+
Browse by last name:
[% FOREACH letter IN alphabet.split(' ') %]
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 efc0587f05..54695170da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -125,9 +125,7 @@ $(document).ready(function() {
Email has been sent.
[% END %]
- [% IF ( no_add ) %]
Cannot add patron
- [% IF ( no_branches ) %]
There are no libraries defined. [% IF ( CAN_user_parameters ) %]Please add a library.[% ELSE %]An administrator must define at least one library.[% END %]
[% END %]
- [% IF ( no_categories ) %]
There are no patron categories defined. [% IF ( CAN_user_parameters ) %]Please add a patron category.[% ELSE %]An administrator must define at least one patron category.
[% END %][% END %]
[% END %]
+ [% INCLUDE 'noadd-warnings.inc' %]
[% UNLESS ( no_add ) %]
[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])