diff --git a/ts/components/dialog/edit-profile/EditProfileDialog.tsx b/ts/components/dialog/edit-profile/EditProfileDialog.tsx
index a5e770a30..b4ffdf7d9 100644
--- a/ts/components/dialog/edit-profile/EditProfileDialog.tsx
+++ b/ts/components/dialog/edit-profile/EditProfileDialog.tsx
@@ -194,17 +194,17 @@ export const EditProfileDialog = () => {
   const backButton =
     mode === 'edit' || mode === 'qr'
       ? [
-        {
-          iconType: 'chevron',
-          iconRotation: 90,
-          onClick: () => {
-            if (loading) {
-              return;
-            }
-            setMode('default');
+          {
+            iconType: 'chevron',
+            iconRotation: 90,
+            onClick: () => {
+              if (loading) {
+                return;
+              }
+              setMode('default');
+            },
           },
-        },
-      ]
+        ]
       : undefined;
 
   const onClickOK = async () => {
diff --git a/ts/components/registration/stages/CreateAccount.tsx b/ts/components/registration/stages/CreateAccount.tsx
index 4146fb6ba..595122f42 100644
--- a/ts/components/registration/stages/CreateAccount.tsx
+++ b/ts/components/registration/stages/CreateAccount.tsx
@@ -35,6 +35,7 @@ import { resetRegistration } from '../RegistrationStages';
 import { ContinueButton, OnboardDescription, OnboardHeading } from '../components';
 import { BackButtonWithinContainer } from '../components/BackButton';
 import { displayNameIsValid, sanitizeDisplayNameOrToast } from '../utils';
+import { ProfileManager } from '../../../session/profile_manager/ProfileManager';
 
 export type AccountDetails = {
   recoveryPassword: string;
@@ -100,8 +101,10 @@ export const CreateAccount = () => {
         throw new Error('Private key not found');
       }
 
+      const validName = await ProfileManager.updateOurProfileDisplayName(displayName, true);
+
       await signUp({
-        displayName,
+        displayName: validName,
         recoveryPassword,
       });
 
diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts
index ef4d7a0fc..1d5d86013 100644
--- a/ts/session/apis/snode_api/retrieveRequest.ts
+++ b/ts/session/apis/snode_api/retrieveRequest.ts
@@ -125,7 +125,6 @@ async function retrieveNextMessages(
   );
   // let exceptions bubble up
   // no retry for this one as this a call we do every few seconds while polling for messages
-  // TODO[epic=ses-825] will this happen before the retrieve display name timeout and break things?
   const timeOutMs = 10 * DURATION.SECONDS; // yes this is a long timeout for just messages, but 4s timeouts way to often...
   const timeoutPromise = async () => sleepFor(timeOutMs);
   const fetchPromise = async () =>
diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts
index b252d117f..d6e145696 100644
--- a/ts/session/profile_manager/ProfileManager.ts
+++ b/ts/session/profile_manager/ProfileManager.ts
@@ -99,8 +99,18 @@ export async function updateOurProfileDisplayName(newName: string, onboarding?:
   const cleanName = sanitizeSessionUsername(newName).trim();
 
   if (onboarding) {
-    const userInfoName = await UserConfigWrapperActions.setUserInfo(cleanName, CONVERSATION_PRIORITIES.default, null);
-    return userInfoName;
+    try {
+      const userInfoName = await UserConfigWrapperActions.setUserInfo(
+        cleanName,
+        CONVERSATION_PRIORITIES.default,
+        null
+      );
+      return userInfoName;
+    } catch (err) {
+      throw err;
+    } finally {
+      await UserConfigWrapperActions.free();
+    }
   }
 
   const ourNumber = UserUtils.getOurPubKeyStrFromCache();
@@ -120,9 +130,9 @@ export async function updateOurProfileDisplayName(newName: string, onboarding?:
     dbPriority,
     dbProfileUrl && dbProfileKey
       ? {
-        url: dbProfileUrl,
-        key: dbProfileKey,
-      }
+          url: dbProfileUrl,
+          key: dbProfileKey,
+        }
       : null
   );
 
diff --git a/ts/test/components/AvatarPlaceHolder_test.tsx b/ts/test/components/AvatarPlaceHolder_test.tsx
index 3c032a8a2..7a012fd58 100644
--- a/ts/test/components/AvatarPlaceHolder_test.tsx
+++ b/ts/test/components/AvatarPlaceHolder_test.tsx
@@ -26,7 +26,6 @@ describe('AvatarPlaceHolder', () => {
   });
 
   it('should render an svg', async () => {
-    // TODO[epic=ses-968] Fix warnings that appear when we run this test.
     const result = renderComponent(
       <AvatarPlaceHolder
         diameter={AvatarSize.XL}