diff --git a/keyserver/src/creators/account-creator.js b/keyserver/src/creators/account-creator.js
--- a/keyserver/src/creators/account-creator.js
+++ b/keyserver/src/creators/account-creator.js
@@ -262,10 +262,7 @@
   viewer.setNewCookie(userViewerData);
 
   await setNewSession(viewer, calendarQuery, 0);
-  await Promise.all([
-    viewerAcknowledgmentUpdater(viewer, policyTypes.tosAndPrivacyPolicy),
-    processAccountCreationCommon(viewer),
-  ]);
+  await processAccountCreationCommon(viewer);
 
   ignorePromiseRejections(
     createAndSendReservedUsernameMessage([
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
@@ -720,6 +720,7 @@
     socialProof,
     signedIdentityKeysBlob,
     initialNotificationsEncryptedMessage,
+    shouldMarkPoliciesAsAcceptedAfterCookieCreation: !existingUserID,
   });
 }