diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index fccffb6..bd3537c 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -30,6 +30,8 @@ $config['des_key'] = '{{getenv "KEY"}}';
 $config['cipher_method'] = '{{getenv "CIPHERMETHOD"}}';
 
 $config['mail_domain'] = '%t';
+$config['username_domain'] = '%t';
+$config['username_domain_forced'] = true;
 $config['password_charset'] = 'UTF-8';
 
 $config['plugins'] = array('managesieve', 'password', 'archive', 'zipdownload');