diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 917909c5..d1f3c5dc 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -24,21 +24,29 @@ class RegistrationForm(wtforms.Form):
         _('Username'),
         [wtforms.validators.Required(),
          wtforms.validators.Length(min=3, max=30),
-         wtforms.validators.Regexp(r'^\w+$')])
+         wtforms.validators.Regexp(r'^\w+$')],
+        description=_(
+            u"This is the name other users will identify you with."))
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required(),
          wtforms.validators.Length(min=6, max=30),
          wtforms.validators.EqualTo(
                 'confirm_password',
-                _('Passwords must match.'))])
+                _('Passwords must match.'))],
+        description=_(
+            u"Try to use a strong password!"))
     confirm_password = wtforms.PasswordField(
         _('Confirm password'),
-        [wtforms.validators.Required()])
+        [wtforms.validators.Required()],
+        description=_(
+            u"Type it again here to make sure there are no spelling mistakes."))
     email = wtforms.TextField(
         _('Email address'),
         [wtforms.validators.Required(),
-         wtforms.validators.Email()])
+         wtforms.validators.Email()],
+        description=_(
+            u"Your email will never be published."))
 
 
 class LoginForm(wtforms.Form):
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 2639522a..4038de98 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -20,9 +20,6 @@
 {% macro render_field_div(field) %}
   <div class="form_field_box">
     <div class="form_field_label">{{ _(field.label.text) }}</div>
-    {% if field.description -%}
-      <div class="form_field_description">{{ _(field.description) }}</div>
-    {%- endif %}
     <div class="form_field_input">{{ field }}</div>
     {%- if field.errors -%}
       {% for error in field.errors %}
@@ -31,6 +28,9 @@
         </div>
       {% endfor %}
     {%- endif %}
+    {% if field.description -%}
+      <div class="form_field_description">{{ _(field.description) }}</div>
+    {%- endif %}
   </div>
 {%- endmacro %}