diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html
index dc936e5..bfbdf64 100644
--- a/bootstrapform/templates/bootstrapform/field.html
+++ b/bootstrapform/templates/bootstrapform/field.html
@@ -4,10 +4,11 @@
     {% if field|is_checkbox %}
         <div class="{{ classes.single_value }}">
             <div class="checkbox">
-                <label {% if field.field.required and form.required_css_class %}class="{{ form.required_css_class }}"{% endif %}>
-                    {{ field }} <span>{{ field.label }}</span>
-                </label>
-
+                {% 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 %}
                 {% for error in field.errors %}
                     <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
                 {% endfor %}
@@ -20,8 +21,9 @@
             </div>
         </div>
     {% elif field|is_radio %}
-        <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
-
+        {% if field.auto_id %}
+            <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
+        {% endif %}
         <div class="{{ classes.value }}">
             {% for choice in field %}
                 <div class="radio">
@@ -43,7 +45,9 @@
             {% endif %}
         </div>
     {% else %}
-        <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label>
+        {% if field.auto_id %}
+            <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label>
+        {% endif %}
 
         <div class="{{ classes.value }} {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}">
             {{ field }}
diff --git a/docs/install.rst b/docs/install.rst
index 44e03eb..0b62106 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -63,7 +63,7 @@ CHANGELOG
 
 - 2013-8-27:
 
-  Add support for Bootstrap 3, contributed by `Nivl<https://github.com/Nivl>`_
+  Add support for Bootstrap 3, contributed by `Nivl <https://github.com/Nivl>`_
 
 
 - 2013-5-7: