diff --git a/C4/Auth.pm b/C4/Auth.pm
index 7f0475b16f..2d38f49b88 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -2114,23 +2114,12 @@ Missing POD for checkpw_internal.
 =cut
 
 sub checkpw_internal {
-    my ( $userid, $password, $no_set_userenv ) = @_;
+    my ( $identifier, $password, $no_set_userenv ) = @_;
 
     $password = Encode::encode( 'UTF-8', $password )
         if Encode::is_utf8($password);
 
-    my $patron = Koha::Patrons->find( { userid => $userid } );
-    if ($patron) {
-        if ( checkpw_hash( $password, $patron->password ) ) {
-            my $borrowernumber = $patron->borrowernumber;
-            C4::Context->set_userenv(
-                "$borrowernumber",  $patron->userid,  $patron->cardnumber,
-                $patron->firstname, $patron->surname, $patron->branchcode, $patron->library->branchname, $patron->flags
-            ) unless $no_set_userenv;
-            return 1, $patron->cardnumber, $patron->userid, $patron;
-        }
-    }
-    $patron = Koha::Patrons->find( { cardnumber => $userid } );
+    my $patron = Koha::Patrons->find_by_identifier($identifier);
     if ($patron) {
         if ( checkpw_hash( $password, $patron->password ) ) {
             my $borrowernumber = $patron->borrowernumber;
diff --git a/t/db_dependent/Auth.t b/t/db_dependent/Auth.t
index 39585933e5..d5f6c048a9 100755
--- a/t/db_dependent/Auth.t
+++ b/t/db_dependent/Auth.t
@@ -1650,14 +1650,14 @@ subtest 'checkpw for users with shared cardnumber / userid ' => sub {
     my $patron_2 = $builder->build_object( { class => 'Koha::Patrons', value => { userid => $patron_1->cardnumber } } );
     $patron_2->set_password( { password => "PasswordTwo" } );
 
-    my ( $checkpw, $cardnumber, $userid, $patron ) = checkpw( $patron_1->cardnumber, "OnePassword", undef, undef, 1 );
-    ok( $checkpw, 'checkpw returns true for right password when logging in via cardnumber' );
+    my ( $checkpw, $cardnumber, $userid, $patron ) = checkpw( $patron_1->userid, "OnePassword", undef, undef, 1 );
+    ok( $checkpw, 'checkpw returns true for right password when logging in via usrid' );
     is( $cardnumber, $patron_1->cardnumber, 'checkpw returns correct cardnumber' );
     is( $userid,     $patron_1->userid,     'checkpw returns correct userid' );
     is( $patron->id, $patron_1->id,         'checkpw returns correct patron' );
 
-    ( $checkpw, $cardnumber, $userid, $patron ) = checkpw( $patron_2->userid, "PasswordTwo", undef, undef, 1 );
-    ok( $checkpw, 'checkpw returns true for right password when logging in via userid' );
+    ( $checkpw, $cardnumber, $userid, $patron ) = checkpw( $patron_2->cardnumber, "PasswordTwo", undef, undef, 1 );
+    ok( $checkpw, 'checkpw returns true for right password when logging in via carndumber' );
     is( $cardnumber, $patron_2->cardnumber, 'checkpw returns correct cardnumber' );
     is( $userid,     $patron_2->userid,     'checkpw returns correct userid' );
     is( $patron->id, $patron_2->id,         'checkpw returns correct patron' );