diff --git a/C4/Auth.pm b/C4/Auth.pm
index 1592253655..fd4f79da4c 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -1021,6 +1021,7 @@ sub checkauth {
 
             # $return: 1 = valid user, 2 = superlibrarian
             if ($return) {
+                $userid ||= $q_userid if $return == 2;
 
                 #_session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
                 if ( $flags = haspermission( $userid, $flagsrequired ) ) {