diff --git a/modules/core/js_modules/route_handlers.js b/modules/core/js_modules/route_handlers.js
index a32b3ffc87..77c3e445bb 100644
--- a/modules/core/js_modules/route_handlers.js
+++ b/modules/core/js_modules/route_handlers.js
@@ -17,6 +17,7 @@ function applyServersPageHandlers() {
     if (window.githubServersPageHandler) githubServersPageHandler();
     if (window.nasaServersPageHandler) nasaServersPageHandler();
     if (window.smtpServersPageHandler) smtpServersPageHandler();
+    if (window.imapServersPageHandler) imapServersPageHandler();
     if (window.wpServersPageHandler) wpServersPageHandler();
 }
 
diff --git a/modules/core/site.js b/modules/core/site.js
index 6f8b12ece1..e3be6dc3dc 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1901,6 +1901,9 @@ var fillImapData = function(details) {
     if (details.sieve_config_host) {
         $('#srv_setup_stepper_imap_sieve_host').val(details.sieve_config_host);
         $("#srv_setup_stepper_enable_sieve").trigger("click", false);
+        $('#srv_setup_stepper_imap_sieve_mode_tls')
+                            .prop('checked', details.tls)
+                            .trigger('change');
     }
 
     if(details.tls) {
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 5ee584324b..b6d888f091 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -114,7 +114,7 @@ var imap_test_action = function(event) {
     );
 }
 
-var imap_setup_server_page = function() {
+var imapServersPageHandler = function() {
     $('.imap_delete').on('click', imap_delete_action);
     $('.save_imap_connection').on('click', imap_save_action);
     $('.hide_imap_connection').on('click', imap_hide);
diff --git a/tests/selenium/pages.py b/tests/selenium/pages.py
index 18a5286b58..b42fc5061d 100644
--- a/tests/selenium/pages.py
+++ b/tests/selenium/pages.py
@@ -126,7 +126,7 @@ def folders(self):
         list_item.find_element(By.TAG_NAME, 'a').click()
         self.wait_with_folder_list()
         self.safari_workaround()
-        self.wait_for_navigation_to_complete()
+        self.wait(By.CLASS_NAME, 'content_title')
         assert self.by_class('content_title').text == 'Folders'
 
     def save(self):