diff --git a/keyserver/src/user/login.js b/keyserver/src/user/login.js
--- a/keyserver/src/user/login.js
+++ b/keyserver/src/user/login.js
@@ -56,16 +56,13 @@
 }
 
 async function verifyUserLoggedIn(): Promise<IdentityInfo> {
-  const userInfoPromise = getUserCredentials();
-
   const result = await fetchIdentityInfo();
 
   if (result) {
     return result;
   }
 
-  const userInfo = await userInfoPromise;
-
+  const userInfo = await getUserCredentials();
   const identityInfo = await registerOrLogIn(userInfo);
   await saveIdentityInfo(identityInfo);
   return identityInfo;