diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index df219011..09955874 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -64,7 +64,8 @@ class EditAccountForm(wtforms.Form):
     new_password = wtforms.PasswordField(
         _('New password'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30)])
+         wtforms.validators.Length(min=6, max=30)],
+        id="password")
 
 
 class EditAttachmentsForm(wtforms.Form):
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 3517b5c3..44b27bb8 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -19,7 +19,7 @@
 {# Generically render a field #}
 {% macro render_field_div(field) %}
   {% if field.label.text -%}
-    <p class="form_field_label"><label for="{{ field.name }}">{{ _(field.label.text) }}</label></p>
+    <p class="form_field_label"><label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label></p>
   {%- endif %}
   <div class="form_field_input">
     {{ field }}