diff --git a/web/js/pages/add_mail_acc.js b/web/js/pages/add_mail_acc.js
index 35afca2f..a99e8159 100644
--- a/web/js/pages/add_mail_acc.js
+++ b/web/js/pages/add_mail_acc.js
@@ -114,7 +114,7 @@ $(document).ready(function() {
             $('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
     });
 
-    $('#mail_configuration').change(function(evt){
+    $('#mail_configuration').on('change',function(evt){
         var opt = $(evt.target).find('option:selected');
 
         switch(opt.attr('v_type')){
diff --git a/web/js/pages/edit_mail_acc.js b/web/js/pages/edit_mail_acc.js
index 31fd157d..244fd834 100644
--- a/web/js/pages/edit_mail_acc.js
+++ b/web/js/pages/edit_mail_acc.js
@@ -135,7 +135,7 @@ $(document).ready(function() {
                 $('#td_smtp_port').html('465');
                 $('#td_smtp_encryption').html('SSL');
                 break;
-            case 'no_encriptyon':
+            case 'no_encryption':
                 $('#td_imap_hostname').html(opt.attr('domain'));
                 $('#td_smtp_hostname').html(opt.attr('domain'));
 
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index e2fb9a31..79d251d1 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -140,7 +140,7 @@
                                     <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
                                     <option v_type="ssl"><?=__('Use SSL')?></option>
-                                    <option v_type="no_encryption" domain="<?=$v_domain?>" encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
+                                    <option v_type="no_encryption" domain="<?=$v_domain?>" no_encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
                                 </select>
                             </td>
                         </tr>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 6c0e13eb..c69ab725 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -149,7 +149,7 @@
                                     <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
                                     <option v_type="ssl"><?=__('Use SSL')?></option>
-                                    <option v_type="no_encryption" domain="<?=$v_domain?>" encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
+                                    <option v_type="no_encryption" domain="<?=$v_domain?>" no_encryption="<?=__('No encryption')?>"><?=__('No encryption')?></option>
                                 </select>
                             </td>
                         </tr>