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 b0b28d40e9..c259180fd5 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
@@ -132,17 +132,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/ftue_auth_sign_out_all_devices"
-            app:layout_constraintBottom_toTopOf="@id/newPasswordSubmit"
+            app:layout_constraintBottom_toTopOf="@id/entrySignOutAll"
             app:layout_constraintEnd_toEndOf="@id/newPasswordGutterEnd"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toEndOf="@id/entrySignOutAll"
-            app:layout_constraintTop_toBottomOf="@id/newPasswordInput" />
+            app:layout_constraintTop_toBottomOf="@id/entrySignOutAll" />
 
         <Button
             android:id="@+id/newPasswordSubmit"
             style="@style/Widget.Vector.Button.Login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:text="@string/ftue_auth_reset_password"
             android:textAllCaps="true"
             app:layout_constraintBottom_toBottomOf="parent"