diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 39dca7cc..cc30388f 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -18,7 +18,9 @@
 
 {# Generically render a field #}
 {% macro render_field_div(field) %}
-  <p class="form_field_label"><label for="{{ field.name }}">{{ _(field.label.text) }}</label></p>
+  {% if field.label.text -%}
+    <p class="form_field_label"><label for="{{ field.name }}">{{ _(field.label.text) }}</label></p>
+  {%- endif %}
   <div class="form_field_input">
     {{ field }}
     {%- if field.errors -%}