diff --git a/auth/forms.py b/auth/forms.py
index 7a1b4b5fb..6ec848dfb 100644
--- a/auth/forms.py
+++ b/auth/forms.py
@@ -8,6 +8,5 @@ class LoginForm(forms.Form):
         )
     password = forms.CharField(
         label=_("Password"),
-        widget=forms.PasswordInput(attrs={"class" : "span3"}),
-        help_text=_("Password used to authenticate")
+        widget=forms.PasswordInput(attrs={"class" : "span3"})
         )
diff --git a/extensions/amavis_quarantine/templates/amavis_quarantine/viewheader.html b/extensions/amavis_quarantine/templates/amavis_quarantine/viewheader.html
index 3cd8ab7c5..6e5efab6c 100644
--- a/extensions/amavis_quarantine/templates/amavis_quarantine/viewheader.html
+++ b/extensions/amavis_quarantine/templates/amavis_quarantine/viewheader.html
@@ -1,4 +1,4 @@
-<pre id="rawheaders">
+<pre id="rawheaders" class="well">
 {% for k, v in headers %}{{ k }}: {{ v }}
 {% endfor %}
 </pre>
diff --git a/static/js/global.js b/static/js/global.js
index 42e468791..72c9b7a95 100644
--- a/static/js/global.js
+++ b/static/js/global.js
@@ -40,6 +40,7 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         }
         var $div = $('<div id="modalbox" class="modal" >' + data + '</div>')
             .one('shown', function() {
+                $(".help").popover();
                 if (modalcb != undefined) {
                     if (typeof modalcb === "function") modalcb(); else eval(modalcb + '()');
                 }
diff --git a/templates/common/generic_field.html b/templates/common/generic_field.html
index 530b3903f..f0d21c98f 100644
--- a/templates/common/generic_field.html
+++ b/templates/common/generic_field.html
@@ -1,5 +1,7 @@
+{% load i18n %}
 <div class="control-group {% if field.errors %}error{% endif %}"{% if hidden %}style="display: none"{% endif %}>
   {% if field.label %}<label class="control-label" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}
+  {% if 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="controls spaced">
     {{ field }}{% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
   </div>
diff --git a/templates/common/mailheaders.html b/templates/common/mailheaders.html
index f54bd96ab..6e0cc12a3 100644
--- a/templates/common/mailheaders.html
+++ b/templates/common/mailheaders.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% block emailheaders %}
-<div class="well">
+<div id="emailheaders" class="well">
   {% for hdr in headers %}<div class="row">
     <div class="header">{{ hdr.name }}</div><div class="value">{{ hdr.value }}</div>
   </div>{% endfor %}