diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt
index 359bc4cf98..fe872e0ac2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt
@@ -340,7 +340,13 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
                 UsernameStatus.TAKEN
               }
 
-              uiState.update { State(ButtonState.SUBMIT_DISABLED, status, UsernameState.NoUsername) }
+              uiState.update {
+                State(
+                  ButtonState.SUBMIT_DISABLED,
+                  status,
+                  usernameState = UsernameState.CaseChange(Username("${state.nickname}${Usernames.DELIMITER}$discriminator"))
+                )
+              }
             }
 
             UsernameSetResult.NETWORK_ERROR -> {