diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/PSGI.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/PSGI.pm
index dc283ba9b..776713a76 100644
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/PSGI.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/PSGI.pm
@@ -201,7 +201,7 @@ sub userId {
     my $userId =
       $req->userData->{ $Lemonldap::NG::Handler::Main::tsv->{whatToTrace}
           || '_whatToTrace' }
-      || $req->userData->{'uid'} # Fix 2377
+      || $req->userData->{'_user'} # Fix 2377
       || 'anonymous';
 
     $self->logger->debug("Returned userId: $userId");
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm
index 686795f34..7a8533963 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/AD.pm
@@ -150,7 +150,7 @@ sub authenticate {
             and $self->conf->{ldapAllowResetExpiredPassword} )
       )
     {
-        $req->data->{oldpassword} = $self->{password};
+        $req->data->{oldpassword} = $req->data->{password};    # Fix 2377
         $req->data->{noerror}     = 1;
         $self->setSecurity($req);
     }