diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
index a10a591112..fe2f65744f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
@@ -107,6 +107,10 @@ class RegistrationViewModel : ViewModel() {
       store.update {
         it.copy(isReRegister = value)
       }
+
+      if (value) {
+        SignalStore.misc.needsUsernameRestore = true
+      }
     }
 
   val phoneNumber: Phonenumber.PhoneNumber?
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt
index 9ac79e810c..591770bd03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationViewModel.kt
@@ -123,6 +123,10 @@ class RegistrationViewModel : ViewModel() {
       store.update {
         it.copy(isReRegister = value)
       }
+
+      if (value) {
+        SignalStore.misc.needsUsernameRestore = true
+      }
     }
 
   val phoneNumber: Phonenumber.PhoneNumber?