diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index c90e4c7357..af96e551f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -222,11 +222,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getPushRegistrationIntent() {
-    if (Environment.USE_NEW_REGISTRATION) {
-      return org.signal.registration.RegistrationActivity.createIntent(this, MainActivity.clearTop(this));
-    } else {
-      return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
-    }
+    return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
   }
 
   private Intent getEnterSignalPinIntent() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
index e797f1574d..29418b3750 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.sms.SmsRetrieverReceiver
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.Environment
 
 /**
  * Activity to hold the entire registration process.
@@ -82,16 +83,24 @@ class RegistrationActivity : BaseActivity() {
 
     @JvmStatic
     fun newIntentForNewRegistration(context: Context, originalIntent: Intent): Intent {
-      return Intent(context, RegistrationActivity::class.java).apply {
-        putExtra(RE_REGISTRATION_EXTRA, false)
-        setData(originalIntent.data)
+      return if (Environment.USE_NEW_REGISTRATION) {
+        org.signal.registration.RegistrationActivity.createIntent(context, MainActivity.clearTop(context))
+      } else {
+        Intent(context, RegistrationActivity::class.java).apply {
+          putExtra(RE_REGISTRATION_EXTRA, false)
+          setData(originalIntent.data)
+        }
       }
     }
 
     @JvmStatic
     fun newIntentForReRegistration(context: Context): Intent {
-      return Intent(context, RegistrationActivity::class.java).apply {
-        putExtra(RE_REGISTRATION_EXTRA, true)
+      return if (Environment.USE_NEW_REGISTRATION) {
+        org.signal.registration.RegistrationActivity.createIntent(context, MainActivity.clearTop(context))
+      } else {
+        Intent(context, RegistrationActivity::class.java).apply {
+          putExtra(RE_REGISTRATION_EXTRA, true)
+        }
       }
     }
   }