diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -48,9 +48,10 @@
 } from './uploads/uploads.js';
 import { createAuthoritativeKeyserverConfigFiles } from './user/create-configs.js';
 import { fetchIdentityInfo } from './user/identity.js';
-import { verifyUserLoggedIn } from './user/login.js';
+import { authAndSaveIdentityInfo } from './user/login.js';
 import { initENSCache } from './utils/ens-cache.js';
 import { initFCCache } from './utils/fc-cache.js';
+import { syncPlatformDetails } from './utils/identity-utils.js';
 import { getContentSigningKey } from './utils/olm-utils.js';
 import {
   isPrimaryNode,
@@ -180,39 +181,39 @@
         console.log('Error generating QR code', e);
       }
     } else {
-      // Allow login to be optional until staging environment is available
-      try {
-        await (async () => {
-          // Should not be run by Landing or WebApp nodes
-          if (!isPrimaryNode && !isSecondaryNode) {
-            return;
-          }
-
-          // We await here to ensure that the keyserver has been provisioned a
-          // commServicesAccessToken. In the future, this will be necessary for
-          // many keyserver operations.
-          const identityInfo = await verifyUserLoggedIn();
-
-          if (!isPrimaryNode) {
-            return;
-          }
-
-          // We don't await here, as Tunnelbroker communication is not needed
-          // for normal keyserver behavior yet. In addition, this doesn't
-          // return information useful for other keyserver functions.
-          ignorePromiseRejections(createAndMaintainTunnelbrokerWebsocket(null));
-
-          if (process.env.NODE_ENV !== 'development') {
-            return;
-          }
-
-          await createAuthoritativeKeyserverConfigFiles(identityInfo.userId);
-        })();
-      } catch (e) {
-        console.warn(
-          'Failed identity login. Login optional until staging environment is available',
-        );
+      // Should not be run by Landing or WebApp nodes
+      if (!isPrimaryNode && !isSecondaryNode) {
+        return;
+      }
+
+      let identityInfo = await fetchIdentityInfo();
+      // Secondary nodes should not attempt identity auth. Instead, they should
+      // poll until the identity info is in the database
+      if (isSecondaryNode) {
+        while (!identityInfo) {
+          await sleep(5000);
+          identityInfo = await fetchIdentityInfo();
+        }
+        return;
       }
+      // If the primary node is able to fetch persisted identity info, it should
+      // attempt to sync platform details with the identity service
+      if (identityInfo) {
+        ignorePromiseRejections(syncPlatformDetails(identityInfo));
+      } else {
+        identityInfo = await authAndSaveIdentityInfo();
+      }
+
+      // We don't await here, as Tunnelbroker communication is not needed
+      // for normal keyserver behavior yet. In addition, this doesn't
+      // return information useful for other keyserver functions.
+      ignorePromiseRejections(createAndMaintainTunnelbrokerWebsocket(null));
+
+      if (process.env.NODE_ENV !== 'development') {
+        return;
+      }
+
+      await createAuthoritativeKeyserverConfigFiles(identityInfo.userId);
     }
 
     if (!isCPUProfilingEnabled) {
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
@@ -258,4 +258,8 @@
   }
 }
 
-export { verifyUserLoggedIn, verifyUserLoggedInWithoutDB };
+export {
+  verifyUserLoggedIn,
+  verifyUserLoggedInWithoutDB,
+  authAndSaveIdentityInfo,
+};
diff --git a/keyserver/src/utils/identity-utils.js b/keyserver/src/utils/identity-utils.js
--- a/keyserver/src/utils/identity-utils.js
+++ b/keyserver/src/utils/identity-utils.js
@@ -5,6 +5,7 @@
 import type { UserIdentitiesResponse } from 'lib/types/identity-service-types.js';
 
 import { getContentSigningKey } from './olm-utils.js';
+import type { IdentityInfo } from '../user/identity.js';
 import { verifyUserLoggedIn } from '../user/login.js';
 
 async function findUserIdentities(
@@ -39,4 +40,16 @@
   );
 }
 
-export { findUserIdentities, privilegedDeleteUsers };
+async function syncPlatformDetails(identityInfo: IdentityInfo): Promise<void> {
+  const [rustAPI, deviceID] = await Promise.all([
+    getRustAPI(),
+    getContentSigningKey(),
+  ]);
+  return rustAPI.syncPlatformDetails(
+    identityInfo.userId,
+    deviceID,
+    identityInfo.accessToken,
+  );
+}
+
+export { findUserIdentities, privilegedDeleteUsers, syncPlatformDetails };