diff --git a/src/tpl/create-account.html b/src/tpl/create-account.html
index 6da6f25..51a2b54 100644
--- a/src/tpl/create-account.html
+++ b/src/tpl/create-account.html
@@ -8,6 +8,9 @@
       <p class="typo-paragraph">Sign up for an encrypted mailbox hosted in Germany. Already have an account? <a href="#" wo-touch="$event.preventDefault(); loginToExisting()">Log in here</a></p>
       <form class="form" name="form">
         <p class="form__error-message" ng-show="errMsg">{{errMsg}}</p>
+        <div class="form__row">
+          <input class="input-text" type="text" ng-model="realname" placeholder="Full name (optional)" tabindex="2">
+        </div>
         <div class="form__row">
           <div class="input-email-fixed-domain">
             <input class="input-text" ng-model="user" required type="text" tabindex="1"
@@ -16,9 +19,6 @@
             <span>{{domain}}</span>
           </div>
         </div>
-        <div class="form__row">
-          <input class="input-text" type="text" ng-model="realname" placeholder="Full name (optional)" tabindex="2">
-        </div>
         <div class="form__row form__row--multi">
           <div class="form__col">
             <input class="input-text" ng-model="pass" required type="password" placeholder="Password" pattern=".{3,30}"  tabindex="3">
diff --git a/src/tpl/login-set-credentials.html b/src/tpl/login-set-credentials.html
index 1ec5e19..59770cd 100644
--- a/src/tpl/login-set-credentials.html
+++ b/src/tpl/login-set-credentials.html
@@ -26,14 +26,14 @@
           </p>
         </fieldset>
 
-        <div class="form__row">
-          <input class="input-text" type="email" required ng-model="emailAddress"
-            placeholder="Email address" tabindex="1" spellcheck="false">
-        </div>
         <div class="form__row">
           <input class="input-text" type="text" ng-model="realname"
             placeholder="Full name (optional)" tabindex="2">
         </div>
+        <div class="form__row">
+          <input class="input-text" type="email" required ng-model="emailAddress"
+            placeholder="Email address" tabindex="1" spellcheck="false">
+        </div>
         <div class="form__row" ng-hide="useOAuth">
           <input ng-required="!useOAuth" class="input-text" type="password"
             ng-model="password" placeholder="Password" tabindex="3">