diff --git a/libtextsecure/storage/user.js b/libtextsecure/storage/user.js
index 091f1a805..1d48ae721 100644
--- a/libtextsecure/storage/user.js
+++ b/libtextsecure/storage/user.js
@@ -36,6 +36,17 @@
       textsecure.storage.put('is_restoring_from_seed', isRestoringFromSeed);
     },
 
+    getLastProfileUpdateTimestamp() {
+      return textsecure.storage.get('last_profile_update_timestamp');
+    },
+
+    setLastProfileUpdateTimestamp(lastUpdateTimestamp) {
+      textsecure.storage.put(
+        'last_profile_update_timestamp',
+        lastUpdateTimestamp
+      );
+    },
+
     getDeviceId() {
       const numberId = textsecure.storage.get('number_id');
       if (numberId === undefined) {
diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationTabs.tsx
index 0f1a55fd1..b50c49662 100644
--- a/ts/components/session/registration/RegistrationTabs.tsx
+++ b/ts/components/session/registration/RegistrationTabs.tsx
@@ -106,7 +106,7 @@ export async function signUp(signUpDetails: {
     await window
       .getAccountManager()
       .registerSingleDevice(generatedRecoveryPhrase, 'english', trimName);
-    // We are just creating a new account, no need to wait for a configuration message
+    await UserUtils.setLastProfileUpdateTimestamp(Date.now());
     trigger('openInbox');
   } catch (e) {
     ToastUtils.pushToastError(
diff --git a/ts/components/session/registration/SignInTab.tsx b/ts/components/session/registration/SignInTab.tsx
index cc372c643..77e1707fa 100644
--- a/ts/components/session/registration/SignInTab.tsx
+++ b/ts/components/session/registration/SignInTab.tsx
@@ -13,10 +13,10 @@ export enum SignInMode {
   UsingRecoveryPhrase,
   LinkDevice,
 }
+// tslint:disable: use-simple-attributes
+// tslint:disable: react-unused-props-and-state
 
-export interface Props {
-  // tslint:disable: react-unused-props-and-state
-}
+export interface Props {}
 
 const LinkDeviceButton = (props: { onLinkDeviceButtonClicked: () => any }) => {
   return (
@@ -99,7 +99,6 @@ export const SignInTab = (props: Props) => {
   return (
     <div className="session-registration__content">
       {signInMode !== SignInMode.Default && (
-        // tslint:disable: use-simple-attributes
         <RegistrationUserDetails
           showDisplayNameField={signInMode === SignInMode.UsingRecoveryPhrase}
           showSeedField={true}
diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts
index 500ae81f4..5c0d35e8a 100644
--- a/ts/session/utils/User.ts
+++ b/ts/session/utils/User.ts
@@ -105,3 +105,13 @@ export function getOurProfile(): OurLokiProfile | undefined {
     return undefined;
   }
 }
+
+export function getLastProfileUpdateTimestamp(): number | undefined {
+  return window.textsecure.storage.user.getLastProfileUpdateTimestamp();
+}
+
+export function setLastProfileUpdateTimestamp(lastUpdateTimestamp: number) {
+  return window.textsecure.storage.user.setLastProfileUpdateTimestamp(
+    lastUpdateTimestamp
+  );
+}