diff --git a/README.md b/README.md
index d0973cc2..3a517fa5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ First, choose a random domain name (it doesn't need working DNS)
 and create a chatmail.ini config file:
 
 ```
-cmdeploy init whatever.you.want
+cmdeploy init [77.42.80.106]
 ```
 
 Then, in `cmdeploy/src/cmdeploy/postfix/transport`,
@@ -22,4 +22,4 @@ cmdeploy run --skip-dns-check --ssh-host 77.42.80.106
 
 Finally, you can login with a `dclogin://` code like this, with the correct "domain name" and IP address:
 
-`dclogin:s0m3r4nd0@whatever.you.want?p=w7i8da7h8uads92ycc2rufyl&v=1&ih=77.42.80.106&sh=77.42.80.106&sp=443&ip=443&ic=3&sc=3`
+`dclogin:s0mer4nd0@[77.42.80.106]?p=w7i8da7h8uads92ycc2rufyl&v=1&ih=77.42.80.106&sh=77.42.80.106&sp=443&ip=443&ic=3&sc=3`
diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py
index 56d39b1f..6be7b964 100644
--- a/cmdeploy/src/cmdeploy/cmdeploy.py
+++ b/cmdeploy/src/cmdeploy/cmdeploy.py
@@ -89,6 +89,7 @@ def run_cmd(args, out):
     """Deploy chatmail services on the remote server."""
 
     ssh_host = args.ssh_host if args.ssh_host else args.config.mail_domain
+    ssh_host = ssh_host.strip("[").strip("]")
     sshexec = get_sshexec(ssh_host)
     require_iroh = args.config.enable_iroh_relay
     if not args.dns_check_disabled:
diff --git a/cmdeploy/src/cmdeploy/dovecot/dovecot.conf.j2 b/cmdeploy/src/cmdeploy/dovecot/dovecot.conf.j2
index bda14325..76815613 100644
--- a/cmdeploy/src/cmdeploy/dovecot/dovecot.conf.j2
+++ b/cmdeploy/src/cmdeploy/dovecot/dovecot.conf.j2
@@ -7,6 +7,7 @@ listen = *
 protocols = imap lmtp
 
 auth_mechanisms = plain
+auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@[]
 
 {% if debug == true %}
 auth_verbose = yes
diff --git a/cmdeploy/src/cmdeploy/postfix/main.cf.j2 b/cmdeploy/src/cmdeploy/postfix/main.cf.j2
index 88f31ac6..333c2e48 100644
--- a/cmdeploy/src/cmdeploy/postfix/main.cf.j2
+++ b/cmdeploy/src/cmdeploy/postfix/main.cf.j2
@@ -54,7 +54,6 @@ smtpd_tls_exclude_ciphers = aNULL, RC4, MD5, DES
 tls_preempt_cipherlist = yes
 
 smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-myhostname = {{ config.mail_domain }}
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 
diff --git a/cmdeploy/src/cmdeploy/postfix/transport b/cmdeploy/src/cmdeploy/postfix/transport
index 12903044..6432039f 100644
--- a/cmdeploy/src/cmdeploy/postfix/transport
+++ b/cmdeploy/src/cmdeploy/postfix/transport
@@ -1,5 +1,2 @@
-no-dns.chatmail.at smtp:[77.42.80.106]
-no-dns2.testrun.org smtp:[77.42.86.249]
-
 nine.testrun.org discard:
 * :