diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 4b980301..3f508af4 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -45,11 +45,11 @@
       {{ wtforms_util.render_field_div(form.new_password) }}
       <div class="form_field_input">
         <p>{{ form.wants_comment_notification }}
-           {{ form.wants_comment_notification.label }}</p>
+           {{ wtforms_util.render_label(form.wants_comment_notification) }}</p>
       </div>
       <div class="form_field_input">
         <p>{{ form.license_preference }}
-           {{ form.license_preference.label }}</p>
+           {{ wtforms_util.render_label(form.license_preference) }}</p>
       </div>
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
index 7499c0cf..2b790584 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
@@ -36,7 +36,7 @@
 	  
       <p class="delete_checkbox_box">
 	{{ form.confirm }}
-	<label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
+	{{ wtforms_util.render_label(form.confirm) }}
       </p>
 
       <div class="form_submit_buttons">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
index 447201cd..449cc3ce 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
@@ -42,7 +42,7 @@
 
       <p class="delete_checkbox_box">
 	{{ form.confirm }}
-	<label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
+	{{ wtforms_util.render_label(form.confirm) }}
       </p>
 
       <div class="form_submit_buttons">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
index 159eeeb4..0fa0a9f4 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html
@@ -48,9 +48,7 @@
 
       <br />
 
-      <p class="form_field_label">
-	<label for="{{ (form.collection.name) }}">{{ _(form.collection.label.text) }}</label>
-      </p>
+      {{- wtforms_util.render_label_p(form.collection) }}
       <div class="form_field_input">
 	{{ form.collection }}
 	<a class="button_action" id="button_addcollection">{% trans %}+{% endtrans %}</a>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index d2a5655e..1d7dcc17 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -40,7 +40,7 @@
 
       <p class="delete_checkbox_box">
 	{{ form.confirm }}
-	<label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
+	{{ wtforms_util.render_label(form.confirm) }}
       </p>
 
       <div class="form_submit_buttons">
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index df2354ed..35b4aa04 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -16,11 +16,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
+{# Render the label for a field #}
+{% macro render_label(field) %}
+  {%- if field.label.text -%}
+    <label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label>
+  {%- endif -%}
+{%- endmacro %}
+
+{# Render the label in a <p> for a field #}
+{% macro render_label_p(field) %}
+  {%- if field.label.text %}
+    <p class="form_field_label">
+      {{- render_label(field) -}}
+    </p>
+  {%- endif %}
+{%- endmacro %}
+
 {# Generically render a field #}
 {% macro render_field_div(field) %}
-  {% if field.label.text -%}
-    <p class="form_field_label"><label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label></p>
-  {%- endif %}
+  {{- render_label_p(field) }}
   <div class="form_field_input">
     {{ field }}
     {%- if field.errors -%}