diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
index 53096a098f..b2b495822b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -34,6 +34,11 @@ public final class AppInitialization {
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
     TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
+    TextSecurePreferences.setPasswordDisabled(context, true);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setReadReceiptsEnabled(context, true);
+    TextSecurePreferences.setTypingIndicatorsEnabled(context, true);
+    TextSecurePreferences.setHasSeenWelcomeScreen(context, false);
     ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onFirstEverAppLaunch();
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java
index 6ac71fe6a0..b7f2915f7a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseCreateActivity.java
@@ -66,12 +66,6 @@ public class PassphraseCreateActivity extends PassphraseActivity {
       IdentityKeyUtil.generateIdentityKeys(PassphraseCreateActivity.this);
       VersionTracker.updateLastSeenVersion(PassphraseCreateActivity.this);
 
-      TextSecurePreferences.setLastExperienceVersionCode(PassphraseCreateActivity.this, Util.getCanonicalVersionCode());
-      TextSecurePreferences.setPasswordDisabled(PassphraseCreateActivity.this, true);
-      TextSecurePreferences.setReadReceiptsEnabled(PassphraseCreateActivity.this, true);
-      TextSecurePreferences.setTypingIndicatorsEnabled(PassphraseCreateActivity.this, true);
-      TextSecurePreferences.setHasSeenWelcomeScreen(PassphraseCreateActivity.this, false);
-
       return null;
     }