diff --git a/forms/common-themes/src/main/resources/theme/base/account/account.ftl b/forms/common-themes/src/main/resources/theme/base/account/account.ftl
index 8a6559995f..a41d769ff5 100755
--- a/forms/common-themes/src/main/resources/theme/base/account/account.ftl
+++ b/forms/common-themes/src/main/resources/theme/base/account/account.ftl
@@ -34,6 +34,15 @@
             </div>
         </div>
 
+        <div class="form-group">
+            <div class="col-sm-2 col-md-2">
+                <label for="firstName" class="control-label">${msg("firstName")}</label> <span class="required">*</span>
+            </div>
+
+            <div class="col-sm-10 col-md-10">
+                <input type="text" class="form-control" id="firstName" name="firstName" value="${(account.firstName!'')?html}"/>
+            </div>
+        </div>
 
         <div class="form-group">
             <div class="col-sm-2 col-md-2">
@@ -45,16 +54,6 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-sm-2 col-md-2">
-                <label for="firstName" class="control-label">${msg("firstName")}</label> <span class="required">*</span>
-            </div>
-
-            <div class="col-sm-10 col-md-10">
-                <input type="text" class="form-control" id="firstName" name="firstName" value="${(account.firstName!'')?html}"/>
-            </div>
-        </div>
-
         <div class="form-group">
             <div class="col-sm-2 col-md-2">
                 <label for="user.attributes.street" class="control-label">${msg("street")}</label>