diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index 53e9564c..a9e71f83 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+additional_conditions = and TRIM(destination) <> ''
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf
index 53e9564c..a9e71f83 100644
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
+additional_conditions = and TRIM(destination) <> ''
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index e67300a8..a9e71f83 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) > '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
index 3c841900..a9e71f83 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = mail_virtual
 select_field = destination
 where_field = email
-additional_conditions = and TRIM(destination) <> '' and destination in (select destination from mail_users where email ='%s' and postfix = 'Y')
-hosts = <SQL_HOST>
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
index 88678917..4484bee2 100644
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
@@ -4,5 +4,5 @@ dbname = <SQL_DB>
 table = panel_domains
 select_field = domain
 where_field = domain
-additional_conditions = and isemaildomain = '1' and deactivated = '0'
+additional_conditions = and isemaildomain = '1'
 hosts = <SQL_HOST>