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
@@ -62,6 +62,10 @@
     return result;
   }
 
+  return authAndSaveIdentityInfo();
+}
+
+async function authAndSaveIdentityInfo(): Promise<IdentityInfo> {
   const userInfo = await getUserCredentials();
   const identityInfo = await registerOrLogIn(userInfo);
   await saveIdentityInfo(identityInfo);