diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index a9e43c86f4f..e979ccb1092 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -32,18 +32,17 @@
                 <form class="oe_signup_form" role="form" method="post">
                     <t t-call="web.database_select"/>
 
+                    <div class="form-group field-login">
+                        <label for="login" class="control-label">Your Email</label>
+                        <input type="email" name="login" t-att-value="login" id="login" class="form-control" autofocus="autofocus"
+                            required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
+                        <input type="hidden" name="login" t-att-value="login" t-if="mode == 'reset' and token"/>
+                    </div>
+
                     <div class="form-group field-name" t-if="not reset_without_token">
                         <label for="name" class="control-label">Your Name</label>
                         <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="e.g. John Doe"
-                            required="required" autofocus="autofocus" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
-                    </div>
-
-                    <div class="form-group field-login">
-                        <label for="login" class="control-label">Your Email</label>
-                        <input type="email" name="login" t-att-value="login" id="login" class="form-control"
-                            t-att-autofocus="'autofocus' if reset_without_token else None"
                             required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
-                        <input type="hidden" name="login" t-att-value="login" t-if="mode == 'reset' and token"/>
                     </div>
 
                     <div class="form-group field-password" t-if="not reset_without_token">