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 361a178107..4f86e49e18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -489,12 +489,12 @@
                                                             <li class="guarantor-details" data-borrowernumber="[% r.guarantor_id | $raw %]">
                                                                 <span class="label">Guarantor:</span>
                                                                 [% INCLUDE 'patron-title.inc' patron=r.guarantor hide_patron_infos_if_needed=1 %]
-                                                                <input type="hidden" class="new_guarantor_id relation-[% r.id | html %]" name="new_guarantor_id" value="[% r.guarantor_id | html %]" />
+                                                                <input type="hidden" class="guarantor_id relation-[% r.id | html %]" name="guarantor_id" value="[% r.guarantor_id | html %]" />
                                                             </li>
                                                             <li>
                                                                 <span class="label">Relationship:</span>
                                                                 <span>[% r.relationship | html %]</span>
-                                                                <input type="hidden" class="new_guarantor_relationship relation-[% r.id | html %]" name="new_guarantor_relationship" value="[% r.relationship | html %]" />
+                                                                <input type="hidden" class="guarantor_relationship relation-[% r.id | html %]" name="guarantor_relationship" value="[% r.relationship | html %]" />
                                                             </li>
 
                                                             <li>
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 59bffba29e..6b39df2996 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -560,6 +560,9 @@ if ( ( !$nok ) and $nodouble and ( $op eq 'cud-insert' or $op eq 'cud-save' ) )
 
         delete $newdata{password2};
 
+        delete $newdata{guarantor_id};
+        delete $newdata{guarantor_relationship};
+
         try {
             $patron->set( \%newdata )->store( { guarantors => \@guarantors } ) if scalar( keys %newdata ) > 1;