diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
index ba6e1165..7e0f79af 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
@@ -4,5 +4,4 @@ dbname = <SQL_DB>
 table = mail_users
 select_field = maildir
 where_field = email
-additional_conditions = and postfix = 'Y'
 hosts = <SQL_HOST>