diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 72d88f89d..2190b8964 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -52,55 +52,53 @@
     </#if>
 
 <section id="add-account" role="region">
-    <fieldset>
+    <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
         <legend>Add new account</legend>
+    
+        <label for="email-address">Email address<span class="requiredHint"> *</span></label>
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
 
-        <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="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 "/>
 
-            <label for="last-name">Last name<span class="requiredHint"> *</span></label> 
-            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input "/>
+        <#include "userAccounts-associateProfilePanel.ftl">
 
-            <#include "userAccounts-associateProfilePanel.ftl">
+        <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>checked</#if> />
+            <label class="inline" for="${role.label}"> ${role.label}</label>
+            <br />
+        </#list>
 
-            <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>checked</#if> />
-                <label class="inline" for="${role.label}"> ${role.label}</label>
-                <br />
-            </#list>
+        <#if emailIsEnabled??>
+            <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>
+        <#else>
+            <table>
+                <tr>
+                    <td>
+                        <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
+                        <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input "/>
+                    </td>
+                    <td>
+                        <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
+                        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+                    </td>
+                </tr>
+            </table>
+            <p>Minimum of ${minimumLength} characters in length.</p>
+        </#if>
 
-            <#if emailIsEnabled??>
-                <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>
-            <#else>
-                <table>
-                    <tr>
-                        <td>
-                            <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
-                            <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input "/>
-                        </td>
-                        <td>
-                            <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
-                            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-                        </td>
-                    </tr>
-                </table>
-                <p>Minimum of ${minimumLength} characters in length.</p>
-            </#if>
+        <input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a class="cancel" href="${formUrls.list}">Cancel</a>
 
-            <input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a class="cancel" href="${formUrls.list}">Cancel</a>
-
-            <p class="requiredHint">* required fields</p>
-        </form>
-    </fieldset>
+        <p class="requiredHint">* required fields</p>
+    </form>
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 6b6749ffb..684bf5698 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -52,61 +52,59 @@
     </#if>
 
 <section id="edit-account" role="region">
-    <fieldset>
+    <form method="POST" action="${formUrls.edit}" id="userAccountForm" class="customForm" role="edit account">
         <legend>Edit new account</legend>
+        
+        <label for="email-address">Email address<span class="requiredHint"> *</span></label>
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
-        <form method="POST" action="${formUrls.edit}" id="userAccountForm" 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" />
+        <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="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" />
 
-            <label for="last-name">Last name<span class="requiredHint"> *</span></label> 
-            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
+        <#include "userAccounts-associateProfilePanel.ftl">
 
-            <#include "userAccounts-associateProfilePanel.ftl">
+        <#if roles?has_content>
+            <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>checked</#if> />
+                <label class="inline" for="${role.label}"> ${role.label}</label>
+                <br />
+            </#list>
+        </#if>
 
-            <#if roles?has_content>
-                <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>checked</#if> />
-                    <label class="inline" for="${role.label}"> ${role.label}</label>
-                    <br />
-                </#list>
-            </#if>
+        <#if emailIsEnabled??>
+            <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
+            <label  class="inline" for="reset-password"> Reset password</label>
 
-            <#if emailIsEnabled??>
-                <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
-                <label  class="inline" for="reset-password"> Reset password</label>
+            <p class="note">
+                Note: Instructions for resetting the password will 
+                be emailed to the address entered above. The password will not 
+                be reset until the user follows the link provided in this email.
+            </p>
+        <#else>
+            <table>
+                <tr>
+                    <td>
+                        <label for="new-password">New password<span class="requiredHint"> *</span></label>
+                        <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+                    </td>
+                    <td>
+                        <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
+                        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+                    </td>
+                </tr>
+            </table>
+            <p>Minimum of ${minimumLength} characters in length.</p>
+            <p>Leaving this blank means that the password will not be changed.</p>
+        </#if>
 
-                <p class="note">
-                    Note: Instructions for resetting the password will 
-                    be emailed to the address entered above. The password will not 
-                    be reset until the user follows the link provided in this email.
-                </p>
-            <#else>
-                <table>
-                    <tr>
-                        <td>
-                            <label for="new-password">New password<span class="requiredHint"> *</span></label>
-                            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-                        </td>
-                        <td>
-                            <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
-                            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-                        </td>
-                    </tr>
-                </table>
-                <p>Minimum of ${minimumLength} characters in length.</p>
-                <p>Leaving this blank means that the password will not be changed.</p>
-            </#if>
+        <input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" 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>
-    </fieldset>
+        <p class="requiredHint">* required fields</p>
+    </form>
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
index c77af6dc5..0a5346c28 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
@@ -32,32 +32,30 @@
     </#if>
 
 <section id="first-time-login" role="region">
-    <fieldset>
-        <p>Please provide your contact information to finish creating your account.</p>
+    <p>Please provide your contact information to finish creating your account.</p>
 
-        <form method="POST" action="${formUrls.firstTimeExternal}" class="customForm" role="my account">
-            <input type="hidden" name="externalAuthId" value="${externalAuthId}" role="input" />
-            <input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" 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" />
+    <form method="POST" action="${formUrls.firstTimeExternal}" class="customForm" role="my account">
+        <input type="hidden" name="externalAuthId" value="${externalAuthId}" role="input" />
+        <input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" 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" />
+        <label for="last-name">Last name<span class="requiredHint"> *</span></label> 
+        <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
-            <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="email-address">Email address<span class="requiredHint"> *</span></label>
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
-            <#if emailIsEnabled??>
-                <p class="note">
-                    Note: An email will be sent to the address entered above notifying 
-                    that an account has been created.
-                </p>
-            </#if>
+        <#if emailIsEnabled??>
+            <p class="note">
+                Note: An email will be sent to the address entered above notifying 
+                that an account has been created.
+            </p>
+        </#if>
 
-            <input type="submit" name="submit" value="Create account" class="submit"/> or <a class="cancel" href="${urls.home}">Cancel</a>
-        </form>
-    </fieldset>
+        <input type="submit" name="submit" value="Create account" class="submit"/> or <a class="cancel" href="${urls.home}">Cancel</a>
+    </form>
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index 6039dc282..9bfa10418 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -58,36 +58,34 @@
     </#if>
 
 <section id="my-account" role="region">
-    <fieldset>
+    <form method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
         <legend>My account</legend>
+        
+        <label for="email-address">Email address<span class="requiredHint"> *</span></label>
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
-        <form method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
-            <label for="email-address">Email address<span class="requiredHint"> *</span></label>
-            <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
+        <p class="note">Note: if email changes, a confirmation email will be sent to the new email address entered above.</p>
+        
+        <label for="first-name">First name<span class="requiredHint"> *</span></label> 
+        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
 
-            <p class="note">Note: if email changes, a confirmation email will be sent to the new email address entered above.</p>
-            
-            <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" />
 
-            <label for="last-name">Last name<span class="requiredHint"> *</span></label> 
-            <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
+        <#if !externalAuth??>
+            <label for="new-password">New password</label>
+            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
 
-            <#if !externalAuth??>
-                <label for="new-password">New password</label>
-                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+            <p class="note">Minimum of ${minimumLength} characters in length. Leaving this blank means that the password will not be changed.</p>
 
-                <p class="note">Minimum of ${minimumLength} characters in length. Leaving this blank means that the password will not be changed.</p>
+            <label for="confirm-password">Confirm new password</label> 
+            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+        </#if>
 
-                <label for="confirm-password">Confirm new password</label> 
-                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-            </#if>
+        <p><input type="submit" name="submitMyAccount" value="Save changes" class="submit" /></p>
 
-            <p><input type="submit" name="submitMyAccount" 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}/css/account/account.css" />')}