diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index 93f60877e..481ac3c00 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -4,9 +4,9 @@
   <div class="col-lg-9 col-md-9 col-sm-9">
     {% if appended_text %}<div class="input-group">{% endif %}
     {{ field }}{% if appended_text %}<span class="input-group-addon">{{ appended_text }}</span></div>{% endif %}{% if help_display_mode == "inline" and field.help_text %}<span class="help-inline">{{ field.help_text }}</span>{% endif %}{% if inline_message %}<span class="help-inline">{{ inline_message }}</span>{% endif %}
-    {% if activator %}<label class="checkbox inline" for="id_{{ field.name }}_act">
+    {% if activator %}<div class="checkbox"><label class="checkbox inline" for="id_{{ field.name }}_act">
       <input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act" {% if activator_value %}checked='checked'{% else %}{% if deactivate_if_empty and field.value == None %}checked='checked'{% endif %}{% endif %}/>{{ activator_label }}
-    </label>{% endif %}
+    </label></div>{% endif %}
     {% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
     {% block extra_controls %}{% endblock %}
   </div>