diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html
index 481ac3c00..ee24d9543 100644
--- a/modoboa/templates/common/generic_field.html
+++ b/modoboa/templates/common/generic_field.html
@@ -1,9 +1,9 @@
 {% load i18n core_tags lib_tags %}
 <div class="form-group {% if field.errors %}error{% endif %}{{ extra_classes }}"{% visirule field %}{% if hidden %}style="display: none"{% endif %}>
-  {% if field.label %}<label class="control-label col-lg-3 col-md-2 col-sm-2" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}{% if help_display_mode == "tooltip" and field.help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>{% endif %}
-  <div class="col-lg-9 col-md-9 col-sm-9">
+  {% if field.label %}<label class="control-label col-lg-3 col-md-4 col-sm-4" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}{% if help_display_mode == "tooltip" and field.help_text %}<a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>{% endif %}
+  <div class="col-lg-5 col-md-5 col-sm-5">
     {% 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 %}
+    {{ 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 pull-right">{{ field.help_text }}</span>{% endif %}{% if inline_message %}<span class="help-inline pull-right">{{ inline_message }}</span>{% endif %}
     {% 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></div>{% endif %}
diff --git a/modoboa/templates/common/generic_fields_group.html b/modoboa/templates/common/generic_fields_group.html
index 294dd2338..b3395ee88 100644
--- a/modoboa/templates/common/generic_fields_group.html
+++ b/modoboa/templates/common/generic_fields_group.html
@@ -1,7 +1,7 @@
 {% load i18n %}
-<div class="input-group {% if haserror %} error{% endif %}">
-  <label class="control-label col-lg-2 col-md-2 col-sm-3">{{ label }}</label>{% if help_text %}<a href="#" class="help pull-left" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>{% endif %}
-  <div class="col-lg-10 col-md-10 col-sm-9">
+<div class="form-group {% if haserror %} error{% endif %}">
+  <label class="control-label col-lg-3 col-md-4 col-sm-4">{{ label }}</label>{% if help_text %}<a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>{% endif %}
+  <div class="col-lg-5 col-md-5 col-sm-5">
     {% for field in group %}
     {{ field }}{% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
     {% endfor %}