diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
index 9770d4c262..5119ba6179 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
@@ -48,14 +48,13 @@ class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<Fragmen
     private fun setupViews() {
         views.emailEntryInput.associateContentStateWith(button = views.emailEntrySubmit)
         views.emailEntryInput.setOnImeDoneListener { startPasswordReset() }
-        views.emailEntrySubmit.debouncedClicks { startPasswordReset() }
-
         views.emailEntryInput.editText().textChanges()
                 .onEach {
                     views.emailEntryInput.error = null
                     views.emailEntrySubmit.isEnabled = it.isEmail()
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.emailEntrySubmit.debouncedClicks { startPasswordReset() }
     }
 
     private fun startPasswordReset() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
index b302a3e4fb..d5d6e508c8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEntryFragment.kt
@@ -51,14 +51,13 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     private fun setupViews() {
         views.newPasswordInput.associateContentStateWith(button = views.newPasswordSubmit)
         views.newPasswordInput.setOnImeDoneListener { resetPassword() }
-        views.newPasswordSubmit.debouncedClicks { resetPassword() }
-
         views.newPasswordInput.editText().textChanges()
                 .onEach {
                     views.newPasswordInput.error = null
                     views.newPasswordSubmit.isEnabled = it.isEmail()
                 }
                 .launchIn(viewLifecycleOwner.lifecycleScope)
+        views.newPasswordSubmit.debouncedClicks { resetPassword() }
     }
 
     private fun resetPassword() {