diff --git a/src/components/Dialogs/SetUserNameDialog/InputStep.tsx b/src/components/Dialogs/SetUserNameDialog/InputStep.tsx
index 77ff517803..9a105d3a58 100644
--- a/src/components/Dialogs/SetUserNameDialog/InputStep.tsx
+++ b/src/components/Dialogs/SetUserNameDialog/InputStep.tsx
@@ -61,6 +61,11 @@ const InputStep: React.FC<Props> = ({ userName, gotoConfirm }) => {
         userName: validateUserName(userName, lang),
       }),
     onSubmit: async ({ userName }, { setSubmitting, setFieldError }) => {
+      if (isLegacyUserConfirm) {
+        gotoConfirm(userName)
+        return
+      }
+
       try {
         const { data } = await client.query({
           query: QUERY_USER_NAME,