diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 06551615b3..f8e718d9ee 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -1361,13 +1361,13 @@ protected function output() {
                         </div>
                         <div class="p-2 flex-fill">
                             <div class="form-check">
-                                <input class="form-check-input" type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls">
+                                <input class="form-check-input" type="radio" id="imap_tls" name="srv_setup_stepper_imap_tls" value="true">
                                 <label class="form-check-label" style="font-size: 12px;" for="imap_tls">
                                   '.$this->trans('Use TLS').'
                                 </label>
                             </div>
                             <div class="form-check">
-                                <input class="form-check-input" type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" checked>
+                                <input class="form-check-input" type="radio" id="imap_start_tls" name="srv_setup_stepper_imap_tls" value="false" checked>
                                 <label class="form-check-label" style="font-size: 12px;" for="imap_start_tls">
                                   '.$this->trans('STARTTLS or unencrypted').'
                                 </label>
diff --git a/modules/imap_folders/modules.php b/modules/imap_folders/modules.php
index 1b626cf170..6dde19959a 100644
--- a/modules/imap_folders/modules.php
+++ b/modules/imap_folders/modules.php
@@ -136,7 +136,7 @@ public function process() {
             $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache);
 
             if (!is_object($imap) || $imap->get_state() != 'authenticated') {
-                Hm_Msgs('ERRUnable to connect to the selected IMAP server');
+                Hm_Msgs::add('ERRUnable to connect to the selected IMAP server');
                 return;
             }
             $specials = $this->user_config->get('special_imap_folders', array());