diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index 568743b510..09991d64b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -299,7 +299,8 @@ Patrons:
          - pref: CollapseFieldsPatronAddForm
            multiple:
                identity: "Patron identity"
-               guarantor: "Guarantor information"
+               guarantor: "Patron guarantor"
+               nonpatron_guarantor: "Non-patron guarantor"
                primary_address: "Main address"
                primary_contact: "Contact information"
                alt_address: "Alternate address"
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 f1d08729cf..39080c7389 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -204,6 +204,7 @@ legend:hover {
                                     [% SWITCH field %]
                                         [% CASE 'identity' %] <span>Patron identity</span> |
                                         [% CASE 'guarantor' %] <span>Guarantor information</span> |
+                                        [% CASE 'nonpatron_guarantor' %] <span>Non-patron guarantor</span> |
                                         [% CASE 'primary_address' %] <span>Main address</span> |
                                         [% CASE 'primary_contact' %] <span>Contact information</span> |
                                         [% CASE 'alt_address' %] <span>Alternate address</span> |
@@ -1700,6 +1701,9 @@ legend:hover {
                         $("#memberentry_guarantor").find('legend').nextAll().toggle();
                         $("#guarantor_template").toggle();
                     [% END %]
+                    [% IF fieldstohide.match('nonpatron_guarantor') %]
+                        $("#non_patron_guarantor").find('legend').nextAll().toggle();
+                    [% END %]
                 [% END %]
                 [% IF fieldstohide.match('primary_address') %]
                     $("#memberentry_mainaddress").find('legend').nextAll().toggle();