diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html
index bfbdf64..d3ce1a3 100644
--- a/bootstrapform/templates/bootstrapform/field.html
+++ b/bootstrapform/templates/bootstrapform/field.html
@@ -2,13 +2,15 @@
 
 <div class="form-group{% if field.errors %} has-error{% endif %}">
     {% if field|is_checkbox %}
+        {% if field.auto_id %}
         <div class="{{ classes.single_value }}">
+        {% else %}
+        <div class="{{ classes.value }}">
+        {% endif %}
             <div class="checkbox">
-                {% if field.auto_id %}
-                    <label {% if field.field.required and form.required_css_class %}class="{{ form.required_css_class }}"{% endif %}>
-                        {{ field }} <span>{{ field.label }}</span>
-                    </label>
-                {% endif %}
+                <label {% if field.field.required and form.required_css_class %}class="{{ form.required_css_class }}"{% endif %}>
+                    {{ field }} <span>{{ field.label }}</span>
+                </label>
                 {% for error in field.errors %}
                     <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
                 {% endfor %}