diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index ade19b680..4ae481c79 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -267,3 +267,6 @@ form.customForm input[name="newPassword"],
 form.customForm input[name="confirmPassword"] {
     width: 10em;
 }
+a.disable-delete {
+    padding-left: 24px;
+}
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index 4f66a20f6..8ea73f014 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -149,13 +149,14 @@
                     <td>
                         <#if account.deletable>
                             <input type="checkbox" name="deleteAccount" value="${account.uri}" />
+                            <#assign disableDeleteAccount = '' />
                             <!-- ignored unless submit action is formUrls.delete -->
                         <#else>
-                            <input type="checkbox" name="deleteAccount" value="${account.uri}" disabled />
+                             <#assign disableDeleteAccount = 'class="disable-delete"' />
                         </#if>
     
                         <#if account.editUrl != "">
-                            <a href="${account.editUrl}" >${account.emailAddress}</a>
+                            <a ${disableDeleteAccount} href="${account.editUrl}" >${account.emailAddress}</a>
                             <!-- when this link is clicked, editAccount is noticed and all other fields are ignored. -->
                         <#else>
                             ${account.emailAddress}