diff --git a/AuthRemoteuser.body.php b/AuthRemoteuser.body.php
index 1c639776445ff6e31f839d0629f00f7c6578cb68..9635a0d4c6ef9666b9ec19e4d6ce4152c6220d35 100644
--- a/AuthRemoteuser.body.php
+++ b/AuthRemoteuser.body.php
@@ -124,6 +124,13 @@ class AuthRemoteuser extends MediaWiki\Session\ImmutableSessionProviderWithCooki
         if (Hooks::run("AuthRemoteUserInitUser",
             array($user, true))
         ) {
+            // Check if above hook or some other effect (e.g.: https://phabricator.wikimedia.org/T95839 )
+            // already created a user in the db. If so, reuse that one.
+            $userFromDb = $user->getInstanceForUpdate();
+            if (null !== $userFromDb) {
+                $user = $user->getInstanceForUpdate();
+            }
+
             $this->setRealName($user);
 
             $this->setEmail($user, $username);