diff --git a/modoboa/lib/templatetags/libextras.py b/modoboa/lib/templatetags/libextras.py
index f65039c6f..38651bcc1 100644
--- a/modoboa/lib/templatetags/libextras.py
+++ b/modoboa/lib/templatetags/libextras.py
@@ -132,7 +132,7 @@ def render_fields_group(form, pattern):
         cpt += 1
 
     return render_to_string("common/generic_fields_group.html", dict(
-            label=label, group=group, haserror=haserror
+            label=label, help_text=first.help_text, group=group, haserror=haserror
             ))
 
 @register.simple_tag
diff --git a/modoboa/templates/common/generic_fields_group.html b/modoboa/templates/common/generic_fields_group.html
index 369236d40..5157946fa 100644
--- a/modoboa/templates/common/generic_fields_group.html
+++ b/modoboa/templates/common/generic_fields_group.html
@@ -1,5 +1,6 @@
+{% load i18n %}
 <div class="control-group{% if haserror %} error{% endif %}">
-  <label class="control-label">{{ label }}</label>
+  <label class="control-label">{{ 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="controls spaced">
     {% for field in group %}
     {{ field }}{% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}