diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 8164f6bbc..394384824 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -80,21 +80,12 @@
             </p>
         <#else>
             <div id="passwordContainer">
-                <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>&nbsp;</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>
-            
+
+                <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
+                <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
                 <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
+                <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> 
+                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </div>
         </#if>
         
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 59ef14edc..0615d105e 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -87,21 +87,13 @@
             </div>
         <#else>
             <div id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> >
-                <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>&nbsp;</td>
-                        <td>
-                            <label for="confirm-password">Confirm new password<span class="requiredHint"> *</span></label> 
-                            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-                        </td>
-                    </tr>
-                </table>
+
+                <label for="new-password">New password</label>
+                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
                 <p class="explanatoryText" style="margin-top:-8px">Minimum of ${minimumLength} characters in length.</p>
                 <p class="explanatoryText">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" />
             </div>
         </#if>
         <br />