diff --git a/core/lib/Security/AuthenticationManager.php b/core/lib/Security/AuthenticationManager.php
index 89dbb16..af2e037 100644
--- a/core/lib/Security/AuthenticationManager.php
+++ b/core/lib/Security/AuthenticationManager.php
@@ -155,6 +155,13 @@ class AuthenticationManager
             );
         }
 
+        if ($session->userIdentifier === null && $session->userIdentity) {
+            $user = $this->userService->fetchByIdentity($session->userIdentity);
+            if ($user) {
+                $session->userIdentifier = $user->getId();
+            }
+        }
+
         // Build provider context
         $context = $this->buildProviderContext($session, $method);