diff --git a/app/routes.py b/app/routes.py
index 196e9de..0c504bb 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -270,8 +270,7 @@ def step4():
                 set_setting(s, setting_value)
             set_setting('first_setup', "false")
             dump_settings("settings.txt")
-            if get_setting("enable_deltachat") == "true":
-                run_madmail_installer()
+            run_madmail_installer()
             db.session.commit()
             return redirect(url_for('setup_complete'))
     if get_setting("first_setup") == "true":
@@ -313,7 +312,6 @@ def admin_settings():
         print(form.errors)
     if form.validate_on_submit():
         if form.submit.data:
-            deltachat_newly_enabled = False
             for s in populate_settings:
                 new_value = getattr(form, s).data
                 if s in bool_settings:
@@ -327,10 +325,6 @@ def admin_settings():
                     non_admin_settings_changed = True
                     if s in CHANGES_REQUIRING_RESTART:
                         app.config['SETTINGS_CHANGED'] = True
-                    if s == 'enable_deltachat' and new_value == "true":
-                        deltachat_newly_enabled = True
-            if deltachat_newly_enabled:
-                run_madmail_installer()
 
             new_logo = form.butterbox_logo.data
             if new_logo.filename:
diff --git a/install_madmail.py b/install_madmail.py
index 626bc71..167d8fd 100644
--- a/install_madmail.py
+++ b/install_madmail.py
@@ -9,7 +9,7 @@ def run_madmail_installer():
     butterbox_hostname = settings["butterbox_hostname"]
 
     cmd = f"sudo ../madmail/madmail install"
-    child = pexpect.spawnu(cmd)
+    child = pexpect.spawn(cmd, encoding = "utf-8")#
     child.logfile = open("install_log.txt", "w")
     child.expect("Customize every setting")
     child.sendline("2")
@@ -27,8 +27,8 @@ def run_madmail_installer():
     child.sendline("")
     child.expect("TLS mode")
     child.sendline("self_signed")
-    child.expect("Disable TLS")
-    child.sendline("y")
+    ##child.expect("Disable TLS verification for clients")
+    ##child.sendline("n")
     child.expect("SMTP port")
     child.sendline("25")
     child.expect("Submission port")
@@ -39,7 +39,9 @@ def run_madmail_installer():
     child.sendline("143")
     child.expect("IMAP TLS port")
     child.sendline("993")
-    child.expect("Enable chatmail")
+    child.expect("Allow insecure")
+    child.sendline("n")
+    child.expect("Enable chatmail endpoint for user registration")
     child.sendline("y")
     child.expect("Chatmail HTTP port")
     child.sendline("8081")