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 d8014c3f45..8cd2d2b3e0 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
@@ -26,6 +26,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.editText
+import im.vector.app.core.extensions.hidePassword
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
 import im.vector.app.databinding.FragmentFtueResetPasswordInputBinding
@@ -74,7 +75,11 @@ class FtueAuthResetPasswordEntryFragment : AbstractFtueAuthFragment<FragmentFtue
     }
 
     override fun updateWithState(state: OnboardingViewState) {
-        views.entrySignOutAll.isVisible = state.resetState.supportsLogoutAllDevices
+        views.signedOutAllGroup.isVisible = state.resetState.supportsLogoutAllDevices
+
+        if (state.isLoading) {
+            views.emailEntryInput.editText().hidePassword()
+        }
     }
 
     override fun resetViewModel() {
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
index 4a9261c3b5..d239532093 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_input.xml
@@ -89,6 +89,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/emailEntryInput"
+            style="@style/Widget.Vector.TextInputLayout.Password"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:hint="@string/ftue_auth_new_password_entry_title"
@@ -102,11 +103,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionDone"
-                android:inputType="textEmailAddress"
+                android:inputType="textPassword"
                 android:maxLines="1" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/signedOutAllGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="entrySignOutAll,signOutAllLabel" />
+
         <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/entrySignOutAll"
             android:layout_width="wrap_content"
@@ -120,6 +127,7 @@
             app:layout_constraintTop_toBottomOf="@id/emailEntryInput" />
 
         <TextView
+            android:id="@+id/signOutAllLabel"
             style="@style/Widget.Vector.TextView.Subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"