diff --git a/modules/web_user/view/user_form.xml b/modules/web_user/view/user_form.xml
index 1fb187063e..8694008c44 100644
--- a/modules/web_user/view/user_form.xml
+++ b/modules/web_user/view/user_form.xml
@@ -11,14 +11,15 @@ this repository contains the full copyright notices and license terms. -->
         <label name="email"/>
         <field name="email" widget="email"/>
         <newline/>
+
+        <label name="password"/>
+        <field name="password" widget="password"/>
+        <button name="reset_password" colspan="2"/>
+
+        <label name="email_valid"/>
+        <field name="email_valid"/>
+        <button name="validate_email" colspan="2"/>
     </group>
     <field name="avatar" widget="image" height="100" width="100" xexpand="0" border="circle"/>
-
-    <label name="password"/>
-    <field name="password" widget="password"/>
-    <button name="reset_password" colspan="2"/>
-    <label name="email_valid"/>
-    <field name="email_valid"/>
-    <button name="validate_email" colspan="2"/>
     <field name="secondary_parties" colspan="4"/>
 </form>