diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
index d0f8e75a5..7208e325b 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
@@ -4,6 +4,8 @@
 
 <h3>Reset your Password</h3>
 
+<p>Please enter your new password for ${userAccount.emailAddress}</p>
+
     <#if errorPasswordIsEmpty??>
         <#assign errorMessage = "No password supplied." />
     </#if>
@@ -24,26 +26,22 @@
     </#if>
 
 <section id="reset-password" role="region">
-    <fieldset>
-        <legend>Please enter your new password for ${userAccount.emailAddress}</legend>
-
-        <form method="POST" action="${formUrls.resetPassword}" class="customForm" role="create password">
-            <input type="hidden" name="user" value="${userAccount.emailAddress}" />
-            <input type="hidden" name="key"  value="${userAccount.passwordLinkExpiresHash}" />
+    <form method="POST" action="${formUrls.resetPassword}" class="customForm" role="create password">
+        <input type="hidden" name="user" value="${userAccount.emailAddress}" />
+        <input type="hidden" name="key"  value="${userAccount.passwordLinkExpiresHash}" />
         
-            <label for="new-password">Password<span class="requiredHint"> *</span></label>
-            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input "/>
+        <label for="new-password">Password<span class="requiredHint"> *</span></label>
+        <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
             
-            <p>Minimum of ${minimumLength} characters in length.</p>
+        <p class="note">Minimum of ${minimumLength} characters in length.</p>
 
-            <label for="confirm-password">Confirm Password<span class="requiredHint"> *</span></label>
-            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input "/>
+        <label for="confirm-password">Confirm Password<span class="requiredHint"> *</span></label>
+        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
 
-            <input type="submit" name="submit" value="Save changes" class="submit"/>
+        <p><input type="submit" name="submit" value="Save changes" class="submit" /></p>
 
-            <p class="requiredHint">* required fields</p>
-        </form>
-    </fieldset>
+        <p class="requiredHint">* required fields</p>
+    </form>
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file