diff --git a/C4/Auth.pm b/C4/Auth.pm
index 22ea838450..ff238fcb56 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1447,6 +1447,10 @@ sub haspermission {
 
 sub getborrowernumber {
     my ($userid) = @_;
+    my $userenv = C4::Context->userenv;
+    if ( defined( $userenv ) && ref( $userenv ) eq 'HASH' && $userenv->{number} ) {
+        return $userenv->{number};
+    }
     my $dbh = C4::Context->dbh;
     for my $field ( 'userid', 'cardnumber' ) {
         my $sth =