diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css
index be8ae20ba..ad2099f6f 100644
--- a/webapp/web/css/edit.css
+++ b/webapp/web/css/edit.css
@@ -355,4 +355,8 @@ div.sparqlform .parenthetical {
     display: block;
     background: #FFF6BF; 
     color: #7F7034;
+}
+.note {
+    font-size: .8em;
+    line-height: 1.3em;
 }
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 8b3de3b17..58bbca38c 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for adding a user account -->
 
-<h1>Add new account</h1>
+<h3>Add new account</h3>
 
     <#if errorEmailIsEmpty??>
         <#assign errorMessage = "You must supply an email address." />
@@ -24,18 +24,6 @@
         <#assign errorMessage = "You must select a role." />
     </#if>
     
-    <#if errorPasswordIsEmpty??>
-        <#assign errorMessage = "No password supplied." />
-    </#if>
-    
-    <#if errorPasswordIsWrongLength??>
-        <#assign errorMessage = "Password must be between 6 and 12 characters." />
-    </#if>
-    
-    <#if errorPasswordsDontMatch??>
-        <#assign errorMessage = "Passwords do not match." />
-    </#if>
-    
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
             <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
@@ -43,52 +31,49 @@
         </section>
     </#if>
 
-<form method="POST" action="${formUrls.add}">
-    Email address * 
-    <br/>
-    <input type="text" name="emailAddress" value="${emailAddress}" />
-    <br/> 
-    First name * 
-    <br/>
-    <input type="text" name="firstName" value="${firstName}" />
-    <br/> 
-    Last name * 
-    <br/>
-    <input type="text" name="lastName" value="${lastName}" />
-    <br/> 
-    <br/> 
-    Roles * 
-    <br/>
-    <#list roles as role>
-        <input type="radio" name="role" value="${role.uri}" <#if selectedRole = role.uri>checked</#if> />${role.label}
-        <br>
-    </#list>
-    <br/>
-    
-    <#if !emailIsEnabled??>
-        Initial password *
-        <input type="password" name="initialPassword" value="${initialPassword}" />
-        <br/>
-        Confirm initial password *
-        <input type="password" name="confirmPassword" value="${confirmPassword}" />
-        <br/>
-    </#if>
-    
-    Associate a profile with this account
-    <br/> 
-    <input type="radio" name="associate" value="yes" <#if associate??>checked</#if> />Yes
-    <br/> 
-    <input type="radio" name="associate" value="no" <#if !associate??>checked</#if> />No
-    <br/> 
-   
-    <#if emailIsEnabled??>
-       <p>
-           Note: An email will be sent to the address entered above 
-           notifying that an account has been created. 
-           It will include instructions for activating the account and creating a password.
-       </p>
-    </#if>
-   
-   <input type="submit" name="submitAdd" value="Add new account" /> 
-   or <a href="${formUrls.list}">Cancel</a>
-</form>
+<section id="add-account" role="region">
+    <fieldset>
+        <legend>Add new account</legend>
+
+        <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
+            <label for="email-address">Email address<span class="requiredHint"> *</span></label>
+            <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
+
+            <label for="first-name">First name<span class="requiredHint"> *</span></label> 
+            <input type="text" name="firstName" value="${firstName}" id="first-name" role="input "/>
+
+            <label for="last-name">Last name<span class="requiredHint"> *</span></label> 
+            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input "/>
+
+            <p>Roles<span class="requiredHint"> *</span> </p>
+            <#list roles as role>
+                <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>selected</#if> />
+                <label class="inline" for="${role.label}"> ${role.label}</label>
+                <br />
+            </#list>
+
+            <p>Associate a profile with this account</p>
+            <input type="radio" name="associate" value="yes" role="radio" <#if associate??>checked</#if> id="associate" />
+            <label class="inline" for="associate"> Yes</label>
+
+            <input type="radio" name="associate" value="no"  role="radio" <#if !associate??>checked</#if> id="no-associate" />
+            <label class="inline" for="no-associate"> No</label>
+
+            <br />
+            <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" />
+            <label  class="inline" for="reset-password"> Reset password</label>
+
+            <p class="note">
+                Note: An email will be sent to the address entered above 
+                notifying that an account has been created. 
+                It will include instructions for activating the account and creating a password.
+            </p>
+
+            <input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a href="${formUrls.list}">Cancel</a>
+
+            <p class="requiredHint">* required fields</p>
+        </form>
+    </fieldset>
+</section>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 95dc4a47f..9df6b9905 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -2,5 +2,5 @@
 
 <#-- Template for editing a user account -->
 
-<h1>Edit user account</h1>
+<h3>Edit user account</h3>
 
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index d4cc2cc31..d59d8d20b 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for displaying list of user accounts -->
 
-<form method="POST" action="${formUrls.list}">
+<form method="POST" action="${formUrls.list}" class="customForm" role="">
 
     <#--current page: <input type="text" name="pageIndex" value="${page.current}" />
     <br />-->
@@ -38,7 +38,7 @@
     <input type="submit" name="list" value="Refresh page" />--> 
 </form>
 
-<form method="POST" action="${formUrls.add}">
+<form method="POST" action="${formUrls.add}" class="customForm" role="">
     <h3>Account  | <input type="submit" class="submit" value="Add new account" /></h3>
 </form>
 
@@ -75,7 +75,7 @@
     </select>
 </section>
 
-<form method="POST" action="${formUrls.list}">
+<form method="POST" action="${formUrls.list}" class="customForm" role="">
     <section id="search-accounts">
         <input type="text" name="" />
         <input class="submit" type="submit" value="Search accounts"/>
@@ -96,7 +96,7 @@
    }
 </SCRIPT>
 
-<form method="POST" action="${formUrls.list}">
+<form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="">
     <section class="accounts">
         <input type="submit" class="submit delete-account" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
         <!--