diff --git a/client/css/forms.css b/client/css/forms.css
index 2f210ea..1ba096f 100644
--- a/client/css/forms.css
+++ b/client/css/forms.css
@@ -21,6 +21,10 @@ form ul {
 form ul li {
     margin-top: 0.5em;
 }
+form ul li label {
+    display: block;
+    padding: 0.5em 0;
+}
 form .input {
     margin-bottom: 1em;
 }
@@ -35,8 +39,6 @@ form .input li:first-child {
 
 form.tabular ul {
     display: table;
-    border-spacing: 0.5em;
-    margin: 0.5em -0.5em;
     width: 100%;
 }
 form.tabular ul li {
@@ -45,17 +47,12 @@ form.tabular ul li {
 form.tabular ul li label {
     display: table-cell;
     width: 33%;
-    padding: 0;
 }
+form.tabular .messages,
 form.tabular .buttons {
     margin-left: 33%;
 }
 
-form:not(.tabular) ul li label {
-    display: block;
-    padding: 0.5em 0;
-}
-
 
 
 /*
diff --git a/client/css/users.css b/client/css/users.css
index 1b413b9..fb77923 100644
--- a/client/css/users.css
+++ b/client/css/users.css
@@ -63,3 +63,6 @@
     width: 45%;
     margin-right: 1em;
 }
+#user-edit form {
+    width: 22.5em;
+}
diff --git a/client/html/user_edit.hbs b/client/html/user_edit.hbs
index 617423c..591094d 100644
--- a/client/html/user_edit.hbs
+++ b/client/html/user_edit.hbs
@@ -1,5 +1,5 @@
 <div id='user-edit'>
-    <form>
+    <form class='tabular'>
         <fieldset class='input'>
             <ul>
                 {{#if this.canEditName}}
@@ -12,8 +12,7 @@
                 {{#if this.canEditPassword}}
                     <li>
                         <label for='user-password'>Password</label>
-                        <input id='user-password' name='password' type='password'/>
-                        <p class='hint'>Leave empty to keep the password unchanged.</p>
+                        <input id='user-password' name='password' type='password' placeholder='leave blank if not changing'/>
                     </li>
                 {{/if}}