diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py
index 9b8f516ab..f6a8e606d 100644
--- a/modoboa/core/app_settings.py
+++ b/modoboa/core/app_settings.py
@@ -41,7 +41,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ('ldap', "LDAP")],
         initial="local",
         help_text=ugettext_lazy("The backend used for authentication"),
-        widget=InlineRadioSelect(attrs={"class": "form-control"})
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     password_scheme = forms.ChoiceField(
@@ -54,7 +54,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ("crypt", ugettext_lazy("crypt (weak)")),
                  ("plain", ugettext_lazy("plain (weak)"))],
         initial="sha512crypt",
-        help_text=ugettext_lazy("Scheme used to crypt mailbox passwords")
+        help_text=ugettext_lazy("Scheme used to crypt mailbox passwords"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     rounds_number = forms.IntegerField(
@@ -99,7 +100,7 @@ class GeneralParametersForm(parameters.AdminParametersForm):
                  ('directbind', ugettext_lazy("Direct bind"))],
         initial='searchbind',
         help_text=ugettext_lazy("Choose the authentication method to use"),
-        widget=InlineRadioSelect(attrs={"class": "form-control"})
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     ldap_bind_dn = forms.CharField(
@@ -187,7 +188,8 @@ class GeneralParametersForm(parameters.AdminParametersForm):
         label=ugettext_lazy("Default top redirection"),
         choices=[],
         initial="user",
-        help_text=ugettext_lazy("The default redirection used when no application is specified")
+        help_text=ugettext_lazy("The default redirection used when no application is specified"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
     # Visibility rules
@@ -324,5 +326,6 @@ class UserSettings(parameters.UserParametersForm):
                  ("fr", "français"), ("it", "italiano"),
                  ("nl", "nederlands"), ("pt", "português"),
                  ("ru", "русский"), ("sv", "svenska")],
-        help_text=ugettext_lazy("Prefered language to display pages")
+        help_text=ugettext_lazy("Prefered language to display pages"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
diff --git a/modoboa/extensions/admin/forms/account.py b/modoboa/extensions/admin/forms/account.py
index 8429f20a4..e40a3e0ff 100644
--- a/modoboa/extensions/admin/forms/account.py
+++ b/modoboa/extensions/admin/forms/account.py
@@ -25,7 +25,8 @@ class AccountFormGeneral(forms.ModelForm):
     role = forms.ChoiceField(
         label=ugettext_lazy("Role"),
         choices=[('', ugettext_lazy("Choose"))],
-        help_text=ugettext_lazy("What level of permission this user will have")
+        help_text=ugettext_lazy("What level of permission this user will have"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
     password1 = forms.CharField(
         label=ugettext_lazy("Password"), widget=forms.PasswordInput
diff --git a/modoboa/extensions/amavis/app_settings.py b/modoboa/extensions/amavis/app_settings.py
index 9d933476c..5638e6757 100644
--- a/modoboa/extensions/amavis/app_settings.py
+++ b/modoboa/extensions/amavis/app_settings.py
@@ -29,7 +29,7 @@ class ParametersForm(AdminParametersForm):
         choices=[("inet", "inet"), ("unix", "unix")],
         initial="unix",
         help_text=_("Mode used to access the PDP server"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     am_pdp_host = forms.CharField(
diff --git a/modoboa/extensions/sievefilters/app_settings.py b/modoboa/extensions/sievefilters/app_settings.py
index 75ae1a684..1502a4515 100644
--- a/modoboa/extensions/sievefilters/app_settings.py
+++ b/modoboa/extensions/sievefilters/app_settings.py
@@ -40,7 +40,8 @@ class ParametersForm(AdminParametersForm):
         label=_("Authentication mechanism"),
         choices=supported_auth_mechs(),
         initial="auto",
-        help_text=_("Prefered authentication mechanism")
+        help_text=_("Prefered authentication mechanism"),
+        widget=forms.Select(attrs={"class": "form-control"})
     )
 
 
@@ -54,7 +55,7 @@ class UserSettings(UserParametersForm):
         label=_("Editor mode"),
         choices=[("raw", "raw"), ("gui", "simplified")],
         help_text=_("Select the mode you want the editor to work in"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     @staticmethod
diff --git a/modoboa/extensions/sievefilters/forms.py b/modoboa/extensions/sievefilters/forms.py
index 11047a395..a3fd804c5 100644
--- a/modoboa/extensions/sievefilters/forms.py
+++ b/modoboa/extensions/sievefilters/forms.py
@@ -63,7 +63,7 @@ class FilterForm(forms.Form):
                      ("anyof", _("Any of the following")),
                      ("all", _("All messages"))],
             initial="anyof",
-            widget=CustomRadioSelect(attrs={"class": "radio inline"})
+            widget=CustomRadioSelect(attrs={"class": "inline", "type": "checkbox"})
         )
 
         self.header_operators = [
diff --git a/modoboa/extensions/webmail/app_settings.py b/modoboa/extensions/webmail/app_settings.py
index a40bdf442..13c1bbf01 100644
--- a/modoboa/extensions/webmail/app_settings.py
+++ b/modoboa/extensions/webmail/app_settings.py
@@ -51,7 +51,7 @@ class ParametersForm(AdminParametersForm):
                  ("ssl", "SSL/TLS")],
         initial="none",
         help_text=_("Use a secured connection to access SMTP server"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
     
     smtp_port = forms.IntegerField(
@@ -77,7 +77,7 @@ class UserSettings(UserParametersForm):
         label=_("Default message display mode"),
         choices=[("html", "html"), ("plain", "text")],
         help_text=_("The default mode used when displaying a message"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     enable_links = YesNoField(
@@ -131,7 +131,7 @@ class UserSettings(UserParametersForm):
         label=_("Default editor"),
         choices=[("html", "html"), ("plain", "text")],
         help_text=_("The default editor to use when composing a message"),
-        widget=InlineRadioSelect
+        widget=InlineRadioSelect(attrs={"type": "checkbox"})
     )
 
     signature = forms.CharField(