diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 3c24057086..0451c06519 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -675,7 +675,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleRegisterForSignal() {
     Intent intent = new Intent(this, RegistrationActivity.class);
-    intent.putExtra("cancel_button", true);
+    intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
     startActivity(intent);
   }
 
diff --git a/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java b/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
index 1a281f4ace..ab8d607203 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
@@ -16,7 +16,7 @@ public class PushRegistrationReminder extends Reminder {
 
     final OnClickListener okListener = v -> {
       Intent intent = new Intent(context, RegistrationActivity.class);
-      intent.putExtra("cancel_button", true);
+      intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
       context.startActivity(intent);
     };
 
diff --git a/src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java b/src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
index a6f3fc0d38..0ee98b5d00 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
@@ -14,7 +14,11 @@ public class UnauthorizedReminder extends Reminder {
     super(context.getString(R.string.UnauthorizedReminder_device_no_longer_registered),
           context.getString(R.string.UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device));
 
-    setOkListener(v -> context.startActivity(new Intent(context, RegistrationActivity.class)));
+    setOkListener(v -> {
+      Intent intent = new Intent(context, RegistrationActivity.class);
+      intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
+      context.startActivity(intent);
+    });
   }
 
   @Override