diff --git a/reviewboard/static/rb/css/config-forms.less b/reviewboard/static/rb/css/config-forms.less
index 743486d0e76ccd6366ca653f21d9e2479d4a458a..30e6e85d722c5256cecf715c43be4783b968ed0c 100644
--- a/reviewboard/static/rb/css/config-forms.less
+++ b/reviewboard/static/rb/css/config-forms.less
@@ -98,10 +98,6 @@
     form {
       margin: 0 auto;
 
-      label {
-        display: block;
-      }
-
       input[type=text],
       input[type=password],
       input[type=email] {
@@ -111,6 +107,20 @@
         padding: 0.3em 0.6em;
       }
 
+      label, p {
+        color: #666666;
+      }
+
+      label {
+        display: block;
+        margin: 0.25em 0;
+      }
+
+      p {
+        font-size: inherit;
+        margin: 1em 0;
+      }
+
       select {
         font-size: inherit;
       }
@@ -165,14 +175,12 @@
             margin-right: 0;
           }
 
-          label {
-            display: block;
-            color: #666666;
-	    margin: 0.25em 0;
-          }
-
           input {
             width: 21em;
+
+            &[type=checkbox] {
+              width: auto;
+            }
           }
 
           ul {
@@ -180,6 +188,10 @@
             margin: 1em 0;
             padding: 0;
 
+            &:last-child {
+              margin-bottom: 0;
+            }
+
             li {
               margin: 0.5em 0;
 
@@ -267,7 +279,9 @@
         }
 
         p {
-          margin-top: 0;
+          &:first-child {
+            margin-top: 0;
+          }
 
           &:last-child {
             margin-bottom: 0;
diff --git a/reviewboard/templates/accounts/prefs_page_form.html b/reviewboard/templates/accounts/prefs_page_form.html
index 60608350f021a09a2c5efb7d42977892b2bef9ab..aa48e0625c5754e3d6396ab03f43e7834439fe78 100644
--- a/reviewboard/templates/accounts/prefs_page_form.html
+++ b/reviewboard/templates/accounts/prefs_page_form.html
@@ -1,5 +1,7 @@
 {% load djblets_forms %}
 
+{% block pre_fields %}{% endblock %}
+
 {% for field in form %}
 {%  if field.is_hidden %}
 {{field}}
@@ -21,6 +23,8 @@
 {%  endif %}
 {% endfor %}
 
+{% block post_fields %}{% endblock %}
+
 {% if form.save_label %}
 <input type="submit" clas="btn" value="{{form.save_label}}" />
 {% endif %}