diff --git a/keyserver/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
--- a/keyserver/src/responders/user-responders.js
+++ b/keyserver/src/responders/user-responders.js
@@ -140,7 +140,7 @@
 import { fetchOlmAccount } from '../updaters/olm-account-updater.js';
 import { userSubscriptionUpdater } from '../updaters/user-subscription-updaters.js';
 import { viewerAcknowledgmentUpdater } from '../updaters/viewer-acknowledgment-updater.js';
-import { fetchIdentityInfo } from '../user/identity.js';
+import { verifyUserLoggedIn } from '../user/login.js';
 import { getOlmUtility, getContentSigningKey } from '../utils/olm-utils.js';
 
 export const subscriptionUpdateRequestInputValidator: TInterface<SubscriptionUpdateRequest> =
@@ -733,7 +733,7 @@
     await Promise.all([
       fetchUsername(userID),
       getContentSigningKey(),
-      fetchIdentityInfo(),
+      verifyUserLoggedIn(),
       getRustAPI(),
     ]);
   if (!existingUsername && doNotRegister) {
diff --git a/keyserver/src/responders/version-responders.js b/keyserver/src/responders/version-responders.js
--- a/keyserver/src/responders/version-responders.js
+++ b/keyserver/src/responders/version-responders.js
@@ -7,7 +7,7 @@
 import { tShape } from 'lib/utils/validation-utils.js';
 
 import type { UserCredentials } from '../user/checks.js';
-import { fetchIdentityInfo } from '../user/identity.js';
+import { verifyUserLoggedIn } from '../user/login.js';
 import { keyserverCodeVersion } from '../version.js';
 
 export const versionResponseValidator: TInterface<VersionResponse> =
@@ -23,7 +23,7 @@
     name: 'user_credentials',
   });
 
-  const identityInfoPromise = fetchIdentityInfo();
+  const identityInfoPromise = verifyUserLoggedIn();
 
   const [userInfo, identityInfo] = await Promise.all([
     userInfoPromise,
diff --git a/keyserver/src/utils/olm-utils.js b/keyserver/src/utils/olm-utils.js
--- a/keyserver/src/utils/olm-utils.js
+++ b/keyserver/src/utils/olm-utils.js
@@ -18,7 +18,7 @@
   fetchCallUpdateOlmAccount,
   fetchOlmAccount,
 } from '../updaters/olm-account-updater.js';
-import { fetchIdentityInfo } from '../user/identity.js';
+import { verifyUserLoggedIn } from '../user/login.js';
 
 type PickledOlmAccount = {
   +picklingKey: string,
@@ -151,7 +151,7 @@
 async function uploadNewOneTimeKeys(numberOfKeys: number) {
   const [rustAPI, identityInfo, deviceID] = await Promise.all([
     getRustAPI(),
-    fetchIdentityInfo(),
+    verifyUserLoggedIn(),
     getContentSigningKey(),
   ]);
 
@@ -225,7 +225,7 @@
   notifAccount: OlmAccount,
 ): Promise<void> {
   const rustAPIPromise = getRustAPI();
-  const fetchIdentityInfoPromise = fetchIdentityInfo();
+  const verifyUserLoggedInPromise = verifyUserLoggedIn();
   const deviceID = JSON.parse(contentAccount.identity_keys()).ed25519;
 
   const { prekey: contentPrekey, prekeySignature: contentPrekeySignature } =
@@ -240,7 +240,7 @@
 
   const [rustAPI, identityInfo] = await Promise.all([
     rustAPIPromise,
-    fetchIdentityInfoPromise,
+    verifyUserLoggedInPromise,
   ]);
 
   if (!identityInfo) {