diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 8355bf5614..6a4add02dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -246,7 +246,11 @@ function validate1(date) {
     [% ELSIF guarantor %]
         <li>
             <span class="label">Guarantor:</span>
-            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
+            [% IF guarantor.borrowernumber %]
+                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
+            [% ELSE %]
+                [% guarantor.firstname %] [% guarantor.surname %]
+            [% END %]
         </li>
     [% END %]
 </ol>
diff --git a/members/moremember.pl b/members/moremember.pl
index 4a5c06dfd9..7c962a4a11 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -169,6 +169,13 @@ if ( my $guarantor = $patron->guarantor ) {
     $template->param( guarantor => $guarantor );
     push @relatives, $guarantor->borrowernumber;
     push @relatives, $_->borrowernumber for $patron->siblings;
+} elsif ( $patron->contactname || $patron->contactfirstname ) {
+    $template->param(
+        guarantor => {
+            firstname => $patron->contactfirstname,
+            surname   => $patron->contactname,
+        }
+    );
 } else {
     my @guarantees = $patron->guarantees;
     $template->param( guarantees => \@guarantees );