diff --git a/src/main/twirl/admin/users/edit.scala.html b/src/main/twirl/admin/users/edit.scala.html
index b6d3213..193a8c9 100644
--- a/src/main/twirl/admin/users/edit.scala.html
+++ b/src/main/twirl/admin/users/edit.scala.html
@@ -7,22 +7,23 @@
         <div class="span6">
           <fieldset>
             <label for="userName"><strong>Username</strong></label>
-            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
             <span id="error-userName" class="error"></span>
+            <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           <fieldset>
-            <label for="password"><strong>Password</strong>
+            <label for="password">
+              <strong>Password</strong>
               @if(account.isDefined){
                 (Input to change password)
               }
             </label>
-            <input type="password" name="password" id="password" value="" autocomplete="off"/>
             <span id="error-password" class="error"></span>
+            <input type="password" name="password" id="password" value="" autocomplete="off"/>
           </fieldset>
           <fieldset>
             <label for="mailAddress"><strong>Mail Address</strong></label>
-            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
             <span id="error-mailAddress" class="error"></span>
+            <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
           </fieldset>
           <fieldset>
             <label><strong>User Type</strong></label>
@@ -35,8 +36,8 @@
           </fieldset>
           <fieldset>
             <label><strong>URL (Optional)</strong></label>
-            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
             <span id="error-url" class="error"></span>
+            <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
           </fieldset>
         </div>
         <div class="span6">
diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html
index 3cc297a..76d7516 100644
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -8,8 +8,8 @@
         <div class="span5">
           <fieldset>
             <label for="groupName"><strong>Group name</strong></label>
-            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
             <span id="error-groupName" class="error"></span>
+            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           <fieldset>
             <label for="avatar"><strong>Image (Optional)</strong></label>
@@ -30,7 +30,9 @@
             <input type="text" id="memberName" style="width: 300px; margin-bottom: 0px;"/>
             <input type="button" class="btn" value="Add" id="addMember"/>
             <input type="hidden" id="memberNames" name="memberNames" value=""/>
-            <span class="error" id="error-memberName"></span>
+            <div>
+              <span class="error" id="error-memberName"></span>
+            </div>
           </fieldset>
         </div>
       </div>