diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py
index 234cfe50e..99eaef814 100644
--- a/modoboa/core/app_settings.py
+++ b/modoboa/core/app_settings.py
@@ -44,7 +44,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ('ldap', "LDAP")],
         initial="local",
         help_text=ugettext_lazy("The backend used for authentication"),
-        widget=forms.Select(attrs={"class": "form-control"})
+        widget=InlineRadioSelect
     )
 
     password_scheme = forms.ChoiceField(
@@ -215,7 +215,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         label=_("Top notifications check interval"),
         initial=30,
         help_text=_("Interval between two top notification checks"),
-        widget=forms.NumberInput(attrs={"class": "form-control"})
+        widget=forms.TextInput(attrs={"class": "form-control"})
     )
 
     check_new_versions = YesNoField(
@@ -245,7 +245,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         initial="user",
         help_text=ugettext_lazy(
             "The default redirection used when no application is specified"
-        )
+        ),
         widget=forms.Select(attrs={"class": "form-control"})
     )
 
diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py
index 35cd4e02e..87da11a43 100644
--- a/modoboa/lib/templatetags/lib_tags.py
+++ b/modoboa/lib/templatetags/lib_tags.py
@@ -113,8 +113,8 @@ def pagination_bar(page):
 
 @register.simple_tag
 def alert(msg, typ):
-    t = Template("""<div class="alert alert-{{ type }}">
-<a class="btn btn-default close" data-dismiss="alert">×</a>
+    t = Template("""<div class="alert alert-{{ type }}" role="alert">
+<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
 {{ msg }}
 </div>""")
     return t.render(Context(dict(type=typ, msg=msg)))
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index aacfe779b..281042597 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -52,7 +52,7 @@
         </div>
       </form>
       <div class="login-error">
-        {% if error %}{% alert error "error" %}{% endif %}
+        {% if error %}{% alert error "danger" %}{% endif %}
       </div>
       </div>
       {% for annoucement in annoucements %}