diff --git a/app/routes.py b/app/routes.py
index 6d53e64..7c0fb47 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -357,7 +357,7 @@ def deltachat_credentials():
     username = gen_username()
     password = gen_password()
     hostname = f"{get_setting('butterbox_hostname')}.local"
-    dclink = f"dclogin:{username}@{hostname}/?p={password}&v=1&ih={ip}&ip=143&sh={ip}&sp=25&is=plain&ss=plain&sc=3"
+    dclink = f"dclogin:{username}@{hostname}/?p={password}&v=1&ih={ip}&ip=993&sh={ip}&sp=465&ic=3&ss=default"
     img = qrcode.make(dclink)
     file_object = io.BytesIO()
     img.save(file_object, 'PNG')
diff --git a/install_madmail.py b/install_madmail.py
index cca36a0..be9e996 100644
--- a/install_madmail.py
+++ b/install_madmail.py
@@ -27,7 +27,7 @@ def run_madmail_installer():
     child.expect("TLS mode")
     child.sendline("self_signed")
     child.expect("Disable TLS verification for clients")
-    child.sendline("y")
+    child.sendline("n")
     child.expect("SMTP port")
     child.sendline("25")
     child.expect("Submission port")
@@ -39,7 +39,7 @@ def run_madmail_installer():
     child.expect("IMAP TLS port")
     child.sendline("993")
     child.expect("Allow insecure")
-    child.sendline("y")
+    child.sendline("n")
     child.expect("Enable chatmail endpoint for user registration")
     child.sendline("y")
     child.expect("Chatmail HTTP port")