diff --git a/etc/alternc/templates/alternc/postfix/postfix.cf b/etc/alternc/templates/alternc/postfix/postfix.cf
index 46d8ea72..857fe844 100644
--- a/etc/alternc/templates/alternc/postfix/postfix.cf
+++ b/etc/alternc/templates/alternc/postfix/postfix.cf
@@ -52,5 +52,6 @@ milter_protocol = 6
 smtpd_milters = inet:127.0.0.1:8891
 non_smtpd_milters = inet:127.0.0.1:8891
 message_size_limit = 100000000
+virtual_mailbox_limit = 0
 mailbox_size_limit = 0
 enable_original_recipient = no
diff --git a/etc/alternc/templates/postfix/mytransport.cf b/etc/alternc/templates/postfix/mytransport.cf
index a379ca59..72c3f549 100644
--- a/etc/alternc/templates/postfix/mytransport.cf
+++ b/etc/alternc/templates/postfix/mytransport.cf
@@ -7,6 +7,6 @@ password = %%db_mail_pwd%%
 hosts =%%dbhost%%
 dbname = %%dbname%%
 
-query = SELECT delivery FROM mailbox JOIN address ON address.id = mailbox.address_id JOIN domaines ON domaines.id = address.domain_id WHERE address.address=SUBSTRING_INDEX('%s','@',1) AND domaines.domaine=SUBSTRING_INDEX('%s','@',1)
+query = SELECT delivery FROM mailbox JOIN address ON address.id = mailbox.address_id JOIN domaines ON domaines.id = address.domain_id WHERE address.address=SUBSTRING_INDEX('%s','@',1) AND domaines.domaine=SUBSTRING_INDEX('%s','@',-1)