diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index b6d818f65..2d732c408 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for editing a user account -->
 
-<h3>Edit account</h3>
+<h3><a class="account-menu" href="accountsAdmin">User accounts</a> > Edit account</h3>
 
     <#if errorEmailIsEmpty??>
         <#assign errorMessage = "You must supply an email address." />
@@ -53,13 +53,13 @@
 
         <form method="POST" action="${formUrls.edit}" class="customForm" role="edit account">
             <label for="email-address">Email address<span class="requiredHint"> *</span></label>
-            <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
+            <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 "/>
+            <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 "/>
+            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
             <p>Roles<span class="requiredHint"> *</span> </p>
             <#list roles as role>
@@ -70,13 +70,13 @@
 
             <#if !emailIsEnabled??>
                 <label for="new-password">New password<span class="requiredHint"> *</span></label>
-                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input "/>
+                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
 
                 <p>Minimum of ${minimumLength} characters in length.</p>
                 <p>Leaving this blank means that the password will not be changed.</p>
 
                 <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
-                <input type="text" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input "/>
+                <input type="text" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </#if>
 
             <p>Associate a profile with this account</p>
@@ -98,7 +98,7 @@
                 </p>
             </#if>
     
-            <input type="submit" name="submitEdit" value="Save changes" class="submit"/> or <a href="${formUrls.list}">Cancel</a>
+            <input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a>
 
             <p class="requiredHint">* required fields</p>
         </form>