diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index 0183b864aeb9ec61bc4d499c5be5c9bac5ef7122..6eef4ad4f3f8d8d68825397cbef9ecbe00d974ba 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -47,6 +47,7 @@ Rectangle {
 
     function clearAllTextFields() {
         chooseUsernameButton.enabled = true
+        showAdvancedButton.enabled = true
         usernameEdit.clear()
         advancedAccountSettingsPage.clear()
     }
@@ -212,6 +213,7 @@ Rectangle {
                                     })
                         if (usernameEdit.nameRegistrationState === UsernameLineEdit.NameRegistrationState.FREE) {
                             enabled = false
+                            showAdvancedButton.enabled = false
                             WizardViewStepModel.nextStep()
                         }
 
@@ -246,8 +248,10 @@ Rectangle {
 
                     visible: false
 
-                    onJoinClicked:
+                    onJoinClicked: {
                         chooseUsernameButton.enabled = false
+                        showAdvancedButton.enabled = false
+                    }
                 }
             }
         }