diff --git a/templates/main.cf.j2 b/templates/main.cf.j2
index 795b088..60adace 100644
--- a/templates/main.cf.j2
+++ b/templates/main.cf.j2
@@ -89,13 +89,11 @@ virtual_mailbox_domains = {{ postfix.virtual_mailbox_domains|join(' ') }}
 # TODO: This is already enabled when using dovecot as transport
 smtpd_sasl_auth_enable = yes
 smtpd_sasl_security_options = noanonymous
-broken_sasl_auth_clients = yes
 
 # Restrictions
 smtpd_helo_required = yes
 strict_rfc821_envelopes = yes
 disable_vrfy_command = yes
-smtpd_delay_reject = yes
 
 smtpd_helo_restrictions = permit_mynetworks,
                           permit_sasl_authenticated,
@@ -106,6 +104,7 @@ smtpd_helo_restrictions = permit_mynetworks,
 # TODO: This is already enabled when using dovecot as transport
 smtpd_sender_restrictions = reject_non_fqdn_sender,
                             reject_unknown_sender_domain,
+                            reject_sender_login_mismatch,
                             permit_mynetworks,
                             permit_sasl_authenticated