diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html
index e59fa6e..8150352 100644
--- a/bootstrapform/templates/bootstrapform/field.html
+++ b/bootstrapform/templates/bootstrapform/field.html
@@ -4,10 +4,11 @@
{% if field|is_checkbox %}
+ {% if field.auto_id %}
-
+ {% endif %}
{% for error in field.errors %}
{{ error }}
{% endfor %}
@@ -20,8 +21,9 @@
{% else %}{% if field|is_radio %}
-
-
+ {% if field.auto_id %}
+
+ {% endif %}
{% for choice in field %}
@@ -44,8 +46,9 @@
{% else %}
-
-
+ {% if field.auto_id %}
+
+ {% endif %}
{{ field }}