diff --git a/modoboa/extensions/webmail/app_settings.py b/modoboa/extensions/webmail/app_settings.py
index d9df02357..6271f48dc 100644
--- a/modoboa/extensions/webmail/app_settings.py
+++ b/modoboa/extensions/webmail/app_settings.py
@@ -31,7 +31,7 @@ class ParametersForm(AdminParametersForm):
         initial="no",
         help_text=_("Use a secured connection to access IMAP server")
     )
-    
+
     imap_port = forms.IntegerField(
         label=_("Server port"),
         initial=143,
@@ -55,9 +55,9 @@ class ParametersForm(AdminParametersForm):
                  ("ssl", "SSL/TLS")],
         initial="none",
         help_text=_("Use a secured connection to access SMTP server"),
-        widget=forms.Select(attrs={"class": "form-control"})
+        widget=InlineRadioSelect
     )
-    
+
     smtp_port = forms.IntegerField(
         label=_("Server port"),
         initial=25,
@@ -76,7 +76,7 @@ class UserSettings(UserParametersForm):
     app = "webmail"
 
     sep1 = SeparatorField(label=_("Display"))
-    
+
     displaymode = forms.ChoiceField(
         initial="plain",
         label=_("Default message display mode"),
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index 6b5593de3..e3b0387d6 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -128,6 +128,10 @@ label{
     display: none;
 }
 
+.buttons_list .active {
+    display: inline;
+}
+
 .tr-selected {
     background-color: #F5F5F5;
 }
diff --git a/modoboa/static/js/creation_wizard.js b/modoboa/static/js/creation_wizard.js
index 28d903925..8cc767edf 100644
--- a/modoboa/static/js/creation_wizard.js
+++ b/modoboa/static/js/creation_wizard.js
@@ -44,13 +44,13 @@
                 if (!last) {
                     $('input:text:visible:first').focus();
                     this.set_current_title(resp.title);
-                    if (this.options.transition_callbacks[resp.stepid] != undefined) {
+                    if (this.options.transition_callbacks[resp.stepid] !== undefined) {
                         this.options.transition_callbacks[resp.stepid]();
                     }
                     this.$element.carousel('next');
                 } else {
-                    $("#modalbox").modal('hide').remove();
-                    if (this.options.success_callback != undefined) {
+                    $("#modalbox").modal('hide');
+                    if (this.options.success_callback !== undefined) {
                         this.options.success_callback(resp);
                     } else {
                         window.location.reload();
@@ -58,10 +58,10 @@
                 }
             }, this)).fail($.proxy(function(jqxhr) {
                 var resp = $.parseJSON(jqxhr.responseText);
-                if (resp.stepid != undefined) {
+                if (resp.stepid !== undefined) {
                     var stepid = resp.stepid;
                     display_form_errors("step" + stepid, resp);
-                    if (this.options.error_callbacks[stepid] != undefined) {
+                    if (this.options.error_callbacks[stepid] !== undefined) {
                         this.options.error_callbacks[stepid]();
                     }
                     $('input:text:visible:first').focus();
@@ -120,4 +120,4 @@
         error_callbacks: {}
     };
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/modoboa/static/js/global.js b/modoboa/static/js/global.js
index 965a7786b..28f172cc4 100644
--- a/modoboa/static/js/global.js
+++ b/modoboa/static/js/global.js
@@ -36,7 +36,7 @@ function modalbox(e, css, defhref, defcb, defclosecb) {
         url: href
     }).done(function(data) {
         var $div = $('<div />', {
-            id: "modalbox", 'class': "modal", html: data
+            id: "modalbox", 'class': "modal fade", html: data
         });
 
         $div.modal({show: false});
diff --git a/modoboa/templates/common/generic_modal.html b/modoboa/templates/common/generic_modal.html
index ca8c454cc..23a890ca7 100644
--- a/modoboa/templates/common/generic_modal.html
+++ b/modoboa/templates/common/generic_modal.html
@@ -3,7 +3,7 @@
 <div class="modal-dialog">
   <div class="modal-content">
     <div class="modal-header">
-      <a class="close btn btn-default" data-dismiss="modal">x</a>
+      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% trans "Close" %}</span></button>
       <h3 class="modal-title">{{ title }}</h3>
     </div>
     <div class="modal-body">    
diff --git a/modoboa/templates/common/wizard_forms.html b/modoboa/templates/common/wizard_forms.html
index f1d85e43a..96066bf6b 100644
--- a/modoboa/templates/common/wizard_forms.html
+++ b/modoboa/templates/common/wizard_forms.html
@@ -3,8 +3,8 @@
 <div class="modal-dialog">
   <div class="modal-content">
     <div class="modal-header">
-      <a class="btn btn-default close" data-dismiss="modal">x</a>
-      <h3>{{ title }} / <small>{{ wizard.first_step.title }}</small></h3>
+      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{% trans "Close" %}</span></button>
+      <h3 class="modal-title">{{ title }} / <small>{{ wizard.first_step.title }}</small></h3>
     </div>
     <div class="modal-body">
       <form class="form-horizontal" action="{{ action }}" enctype="{{ enctype }}"