diff --git a/src/main/scala/app/UserManagementController.scala b/src/main/scala/app/UserManagementController.scala
index e0405ed..2a44cb9 100644
--- a/src/main/scala/app/UserManagementController.scala
+++ b/src/main/scala/app/UserManagementController.scala
@@ -48,7 +48,7 @@
   )(EditUserForm.apply)
 
   val newGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier))),
+    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier, uniqueUserName))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text()))),
     "memberNames" -> trim(label("Member Names" , optional(text())))
diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html
index 2e5286e..240622c 100644
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -8,12 +8,16 @@
         <div class="span7">
           <fieldset>
             <label for="groupName" class="strong">Group name</label>
-            <span id="error-groupName" class="error"></span>
+            <div>
+              <span id="error-groupName" class="error"></span>
+            </div>
             <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           <fieldset>
             <label class="strong">URL (Optional)</label>
-            <span id="error-url" class="error"></span>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
             <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
           </fieldset>
           <fieldset>
diff --git a/src/main/twirl/admin/users/user.scala.html b/src/main/twirl/admin/users/user.scala.html
index d4ac673..b49d710 100644
--- a/src/main/twirl/admin/users/user.scala.html
+++ b/src/main/twirl/admin/users/user.scala.html
@@ -7,7 +7,9 @@
         <div class="span6">
           <fieldset>
             <label for="userName" class="strong">Username:</label>
-            <span id="error-userName" class="error"></span>
+            <div>
+              <span id="error-userName" class="error"></span>
+            </div>
             <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           @if(account.map(_.password.nonEmpty).getOrElse(true)){
@@ -19,18 +21,24 @@
                 }
                 :
               </label>
-              <span id="error-password" class="error"></span>
+              <div>
+                <span id="error-password" class="error"></span>
+              </div>
               <input type="password" name="password" id="password" value="" autocomplete="off"/>
             </fieldset>
           }
           <fieldset>
             <label for="fullName" class="strong">Full Name:</label>
-            <span id="error-fullName" class="error"></span>
+            <div>
+              <span id="error-fullName" class="error"></span>
+            </div>
             <input type="text" name="fullName" id="fullName" value="@account.map(_.fullName)"/>
           </fieldset>
           <fieldset>
             <label for="mailAddress" class="strong">Mail Address:</label>
-            <span id="error-mailAddress" class="error"></span>
+            <div>
+              <span id="error-mailAddress" class="error"></span>
+            </div>
             <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
           </fieldset>
           <fieldset>
@@ -44,7 +52,9 @@
           </fieldset>
           <fieldset>
             <label class="strong">URL (Optional):</label>
-            <span id="error-url" class="error"></span>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
             <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
           </fieldset>
         </div>