diff --git a/bin/v-backup-user b/bin/v-backup-user
index e2987eda1..b98feb3cc 100755
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@@ -508,7 +508,6 @@ local_backup(){
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$BACKUPS" -le "$backups_count" ]; then
         backups_rm_number=$((backups_count - BACKUPS))
-        (( ++backups_rm_number))
 
         # Removing old backup
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
@@ -624,7 +623,7 @@ ftp_backup() {
     fi
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$backups_count" -ge "$BACKUPS" ]; then
-        backups_rm_number=$((backups_count - BACKUPS + 1))
+        backups_rm_number=$((backups_count - BACKUPS))
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do 
             backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//")
             echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\
@@ -779,7 +778,7 @@ sftp_backup() {
     fi
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$backups_count" -ge "$BACKUPS" ]; then
-        backups_rm_number=$((backups_count - BACKUPS + 1))
+        backups_rm_number=$((backups_count - BACKUPS))
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
             backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//")
             echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\
@@ -828,7 +827,7 @@ google_backup() {
     backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2>/dev/null)
     backups_count=$(echo "$backup_list" |wc -l)
     if [ "$backups_count" -ge "$BACKUPS" ]; then
-        backups_rm_number=$((backups_count - BACKUPS + 1))
+        backups_rm_number=$((backups_count - BACKUPS))
         for backup in $(echo "$backup_list" |head -n $backups_rm_number); do 
             echo -e "$(date "+%F %T") Roated gcp backup: $backup"
             $gsutil rm $backup > /dev/null 2>&1
diff --git a/install/debian/7/templates/web/apache2/basedir.stpl b/install/debian/7/templates/web/apache2/basedir.stpl
index a58eefc17..dda3aa760 100644
--- a/install/debian/7/templates/web/apache2/basedir.stpl
+++ b/install/debian/7/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/basedir.tpl b/install/debian/7/templates/web/apache2/basedir.tpl
index bac58f258..9449bc447 100644
--- a/install/debian/7/templates/web/apache2/basedir.tpl
+++ b/install/debian/7/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/default.stpl b/install/debian/7/templates/web/apache2/default.stpl
index e9866ef58..269c09711 100644
--- a/install/debian/7/templates/web/apache2/default.stpl
+++ b/install/debian/7/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/default.tpl b/install/debian/7/templates/web/apache2/default.tpl
index 7f0eacf94..c24b12796 100644
--- a/install/debian/7/templates/web/apache2/default.tpl
+++ b/install/debian/7/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/hosting.stpl b/install/debian/7/templates/web/apache2/hosting.stpl
index d65291db7..627325e06 100644
--- a/install/debian/7/templates/web/apache2/hosting.stpl
+++ b/install/debian/7/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/hosting.tpl b/install/debian/7/templates/web/apache2/hosting.tpl
index ba7021841..0bdd6ea68 100644
--- a/install/debian/7/templates/web/apache2/hosting.tpl
+++ b/install/debian/7/templates/web/apache2/hosting.tpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/phpcgi.stpl b/install/debian/7/templates/web/apache2/phpcgi.stpl
index 1b8fddb5d..aa807091a 100644
--- a/install/debian/7/templates/web/apache2/phpcgi.stpl
+++ b/install/debian/7/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/phpcgi.tpl b/install/debian/7/templates/web/apache2/phpcgi.tpl
index d650e2aed..fd603800b 100644
--- a/install/debian/7/templates/web/apache2/phpcgi.tpl
+++ b/install/debian/7/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/phpfcgid.stpl b/install/debian/7/templates/web/apache2/phpfcgid.stpl
index 996541585..88cea0e64 100644
--- a/install/debian/7/templates/web/apache2/phpfcgid.stpl
+++ b/install/debian/7/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/apache2/phpfcgid.tpl b/install/debian/7/templates/web/apache2/phpfcgid.tpl
index 1f9f912f9..335b9f620 100644
--- a/install/debian/7/templates/web/apache2/phpfcgid.tpl
+++ b/install/debian/7/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/7/templates/web/nginx/caching.stpl b/install/debian/7/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/debian/7/templates/web/nginx/caching.stpl
+++ b/install/debian/7/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/caching.tpl b/install/debian/7/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/debian/7/templates/web/nginx/caching.tpl
+++ b/install/debian/7/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/default.stpl b/install/debian/7/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/debian/7/templates/web/nginx/default.stpl
+++ b/install/debian/7/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/debian/7/templates/web/nginx/default.tpl b/install/debian/7/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/debian/7/templates/web/nginx/default.tpl
+++ b/install/debian/7/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/debian/7/templates/web/nginx/hosting.stpl b/install/debian/7/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/debian/7/templates/web/nginx/hosting.stpl
+++ b/install/debian/7/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/debian/7/templates/web/nginx/hosting.tpl b/install/debian/7/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/debian/7/templates/web/nginx/hosting.tpl
+++ b/install/debian/7/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/default.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/default.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl b/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl b/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/opencart.tpl b/install/debian/7/templates/web/nginx/php5-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/opencart.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl
+++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/apache2/basedir.stpl b/install/debian/8/templates/web/apache2/basedir.stpl
index cc3596a47..d978d4c43 100644
--- a/install/debian/8/templates/web/apache2/basedir.stpl
+++ b/install/debian/8/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/basedir.tpl b/install/debian/8/templates/web/apache2/basedir.tpl
index 8e4f56913..96c94a1bd 100644
--- a/install/debian/8/templates/web/apache2/basedir.tpl
+++ b/install/debian/8/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/default.stpl b/install/debian/8/templates/web/apache2/default.stpl
index 557cb2385..a7faa7219 100644
--- a/install/debian/8/templates/web/apache2/default.stpl
+++ b/install/debian/8/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/default.tpl b/install/debian/8/templates/web/apache2/default.tpl
index fe7120146..3a2270156 100644
--- a/install/debian/8/templates/web/apache2/default.tpl
+++ b/install/debian/8/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/hosting.stpl b/install/debian/8/templates/web/apache2/hosting.stpl
index ba751fe83..8892072b1 100644
--- a/install/debian/8/templates/web/apache2/hosting.stpl
+++ b/install/debian/8/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/hosting.tpl b/install/debian/8/templates/web/apache2/hosting.tpl
index 207e0bbe4..1eb269103 100644
--- a/install/debian/8/templates/web/apache2/hosting.tpl
+++ b/install/debian/8/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/phpcgi.stpl b/install/debian/8/templates/web/apache2/phpcgi.stpl
index 3c34cf358..731355bc1 100644
--- a/install/debian/8/templates/web/apache2/phpcgi.stpl
+++ b/install/debian/8/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/phpcgi.tpl b/install/debian/8/templates/web/apache2/phpcgi.tpl
index 09cee0ac1..c6796d29c 100644
--- a/install/debian/8/templates/web/apache2/phpcgi.tpl
+++ b/install/debian/8/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/phpfcgid.stpl b/install/debian/8/templates/web/apache2/phpfcgid.stpl
index ea57c32aa..156c8a918 100644
--- a/install/debian/8/templates/web/apache2/phpfcgid.stpl
+++ b/install/debian/8/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/apache2/phpfcgid.tpl b/install/debian/8/templates/web/apache2/phpfcgid.tpl
index ed799c723..a4c012690 100644
--- a/install/debian/8/templates/web/apache2/phpfcgid.tpl
+++ b/install/debian/8/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/debian/8/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl
index aaeb60d5d..52641dbef 100755
--- a/install/debian/8/templates/web/nginx/caching.stpl
+++ b/install/debian/8/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/caching.tpl b/install/debian/8/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/debian/8/templates/web/nginx/caching.tpl
+++ b/install/debian/8/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/default.stpl b/install/debian/8/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/debian/8/templates/web/nginx/default.stpl
+++ b/install/debian/8/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/debian/8/templates/web/nginx/default.tpl b/install/debian/8/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/debian/8/templates/web/nginx/default.tpl
+++ b/install/debian/8/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/debian/8/templates/web/nginx/hosting.stpl b/install/debian/8/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/debian/8/templates/web/nginx/hosting.stpl
+++ b/install/debian/8/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/debian/8/templates/web/nginx/hosting.tpl b/install/debian/8/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/debian/8/templates/web/nginx/hosting.tpl
+++ b/install/debian/8/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/default.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/default.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl b/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl b/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/opencart.tpl b/install/debian/8/templates/web/nginx/php5-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/opencart.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl
+++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/httpd/basedir.stpl b/install/rhel/5/templates/web/httpd/basedir.stpl
index 5aa2a865a..4ced9f381 100644
--- a/install/rhel/5/templates/web/httpd/basedir.stpl
+++ b/install/rhel/5/templates/web/httpd/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/basedir.tpl b/install/rhel/5/templates/web/httpd/basedir.tpl
index 76b5b5d6a..566c9884c 100644
--- a/install/rhel/5/templates/web/httpd/basedir.tpl
+++ b/install/rhel/5/templates/web/httpd/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/default.stpl b/install/rhel/5/templates/web/httpd/default.stpl
index 31ddb61cd..cd4a8c88c 100644
--- a/install/rhel/5/templates/web/httpd/default.stpl
+++ b/install/rhel/5/templates/web/httpd/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/default.tpl b/install/rhel/5/templates/web/httpd/default.tpl
index f877cd906..94288db02 100644
--- a/install/rhel/5/templates/web/httpd/default.tpl
+++ b/install/rhel/5/templates/web/httpd/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/hosting.stpl b/install/rhel/5/templates/web/httpd/hosting.stpl
index 1a3ed8fb8..f94ba1867 100644
--- a/install/rhel/5/templates/web/httpd/hosting.stpl
+++ b/install/rhel/5/templates/web/httpd/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/hosting.tpl b/install/rhel/5/templates/web/httpd/hosting.tpl
index 24c83fbc4..1d3dd354b 100644
--- a/install/rhel/5/templates/web/httpd/hosting.tpl
+++ b/install/rhel/5/templates/web/httpd/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/phpcgi.stpl b/install/rhel/5/templates/web/httpd/phpcgi.stpl
index 2ef223531..591693a42 100644
--- a/install/rhel/5/templates/web/httpd/phpcgi.stpl
+++ b/install/rhel/5/templates/web/httpd/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/phpcgi.tpl b/install/rhel/5/templates/web/httpd/phpcgi.tpl
index dd15efa50..114c6a52a 100644
--- a/install/rhel/5/templates/web/httpd/phpcgi.tpl
+++ b/install/rhel/5/templates/web/httpd/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/httpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/phpfcgid.stpl b/install/rhel/5/templates/web/httpd/phpfcgid.stpl
index ebc7f30a3..3bb82cca3 100644
--- a/install/rhel/5/templates/web/httpd/phpfcgid.stpl
+++ b/install/rhel/5/templates/web/httpd/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/httpd/phpfcgid.tpl b/install/rhel/5/templates/web/httpd/phpfcgid.tpl
index 95d43e62d..f4e4f4724 100644
--- a/install/rhel/5/templates/web/httpd/phpfcgid.tpl
+++ b/install/rhel/5/templates/web/httpd/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/httpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/templates/web/nginx/caching.stpl b/install/rhel/5/templates/web/nginx/caching.stpl
index f027bbc4a..67b2f6c20 100755
--- a/install/rhel/5/templates/web/nginx/caching.stpl
+++ b/install/rhel/5/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/caching.tpl b/install/rhel/5/templates/web/nginx/caching.tpl
index fb774a1a8..6d727c67f 100755
--- a/install/rhel/5/templates/web/nginx/caching.tpl
+++ b/install/rhel/5/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/default.stpl b/install/rhel/5/templates/web/nginx/default.stpl
index 52d445b31..53ad8d1b8 100755
--- a/install/rhel/5/templates/web/nginx/default.stpl
+++ b/install/rhel/5/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/5/templates/web/nginx/default.tpl b/install/rhel/5/templates/web/nginx/default.tpl
index e34af0c26..c1fec114f 100755
--- a/install/rhel/5/templates/web/nginx/default.tpl
+++ b/install/rhel/5/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/5/templates/web/nginx/hosting.stpl b/install/rhel/5/templates/web/nginx/hosting.stpl
index 3a4e0a753..aca458a4b 100755
--- a/install/rhel/5/templates/web/nginx/hosting.stpl
+++ b/install/rhel/5/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/5/templates/web/nginx/hosting.tpl b/install/rhel/5/templates/web/nginx/hosting.tpl
index d7ffb37b4..44d874962 100755
--- a/install/rhel/5/templates/web/nginx/hosting.tpl
+++ b/install/rhel/5/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/default.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/default.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl b/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl b/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/opencart.tpl b/install/rhel/5/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/5/wsgi/httpd/wsgi.stpl b/install/rhel/5/wsgi/httpd/wsgi.stpl
index 3e4e45766..e2fdd3f40 100755
--- a/install/rhel/5/wsgi/httpd/wsgi.stpl
+++ b/install/rhel/5/wsgi/httpd/wsgi.stpl
@@ -43,7 +43,7 @@
         Allow from all
     </Directory>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/5/wsgi/httpd/wsgi.tpl b/install/rhel/5/wsgi/httpd/wsgi.tpl
index 5d80a92b5..ad5d8a076 100644
--- a/install/rhel/5/wsgi/httpd/wsgi.tpl
+++ b/install/rhel/5/wsgi/httpd/wsgi.tpl
@@ -38,7 +38,7 @@
         Allow from all
     </Directory>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/basedir.stpl b/install/rhel/6/templates/web/httpd/basedir.stpl
index 5aa2a865a..4ced9f381 100644
--- a/install/rhel/6/templates/web/httpd/basedir.stpl
+++ b/install/rhel/6/templates/web/httpd/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/basedir.tpl b/install/rhel/6/templates/web/httpd/basedir.tpl
index 76b5b5d6a..566c9884c 100644
--- a/install/rhel/6/templates/web/httpd/basedir.tpl
+++ b/install/rhel/6/templates/web/httpd/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/default.stpl b/install/rhel/6/templates/web/httpd/default.stpl
index 31ddb61cd..cd4a8c88c 100644
--- a/install/rhel/6/templates/web/httpd/default.stpl
+++ b/install/rhel/6/templates/web/httpd/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/default.tpl b/install/rhel/6/templates/web/httpd/default.tpl
index f877cd906..94288db02 100644
--- a/install/rhel/6/templates/web/httpd/default.tpl
+++ b/install/rhel/6/templates/web/httpd/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/hosting.stpl b/install/rhel/6/templates/web/httpd/hosting.stpl
index 3d7cb5653..f1c1c1111 100644
--- a/install/rhel/6/templates/web/httpd/hosting.stpl
+++ b/install/rhel/6/templates/web/httpd/hosting.stpl
@@ -44,7 +44,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/hosting.tpl b/install/rhel/6/templates/web/httpd/hosting.tpl
index c5d52e745..65bf20fd3 100644
--- a/install/rhel/6/templates/web/httpd/hosting.tpl
+++ b/install/rhel/6/templates/web/httpd/hosting.tpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/phpcgi.stpl b/install/rhel/6/templates/web/httpd/phpcgi.stpl
index 2ef223531..591693a42 100644
--- a/install/rhel/6/templates/web/httpd/phpcgi.stpl
+++ b/install/rhel/6/templates/web/httpd/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/phpcgi.tpl b/install/rhel/6/templates/web/httpd/phpcgi.tpl
index dd15efa50..114c6a52a 100644
--- a/install/rhel/6/templates/web/httpd/phpcgi.tpl
+++ b/install/rhel/6/templates/web/httpd/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/httpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.stpl b/install/rhel/6/templates/web/httpd/phpfcgid.stpl
index ebc7f30a3..3bb82cca3 100644
--- a/install/rhel/6/templates/web/httpd/phpfcgid.stpl
+++ b/install/rhel/6/templates/web/httpd/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/shttpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.tpl b/install/rhel/6/templates/web/httpd/phpfcgid.tpl
index 95d43e62d..f4e4f4724 100644
--- a/install/rhel/6/templates/web/httpd/phpfcgid.tpl
+++ b/install/rhel/6/templates/web/httpd/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/httpd.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/templates/web/nginx/caching.stpl b/install/rhel/6/templates/web/nginx/caching.stpl
index f027bbc4a..67b2f6c20 100755
--- a/install/rhel/6/templates/web/nginx/caching.stpl
+++ b/install/rhel/6/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/caching.tpl b/install/rhel/6/templates/web/nginx/caching.tpl
index fb774a1a8..6d727c67f 100755
--- a/install/rhel/6/templates/web/nginx/caching.tpl
+++ b/install/rhel/6/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/default.stpl b/install/rhel/6/templates/web/nginx/default.stpl
index 52d445b31..53ad8d1b8 100755
--- a/install/rhel/6/templates/web/nginx/default.stpl
+++ b/install/rhel/6/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/6/templates/web/nginx/default.tpl b/install/rhel/6/templates/web/nginx/default.tpl
index e34af0c26..c1fec114f 100755
--- a/install/rhel/6/templates/web/nginx/default.tpl
+++ b/install/rhel/6/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/6/templates/web/nginx/hosting.stpl b/install/rhel/6/templates/web/nginx/hosting.stpl
index 3a4e0a753..aca458a4b 100755
--- a/install/rhel/6/templates/web/nginx/hosting.stpl
+++ b/install/rhel/6/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/6/templates/web/nginx/hosting.tpl b/install/rhel/6/templates/web/nginx/hosting.tpl
index d7ffb37b4..44d874962 100755
--- a/install/rhel/6/templates/web/nginx/hosting.tpl
+++ b/install/rhel/6/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/default.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/default.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl b/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl b/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/opencart.tpl b/install/rhel/6/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/6/wsgi/httpd/wsgi.stpl b/install/rhel/6/wsgi/httpd/wsgi.stpl
index 3e4e45766..e2fdd3f40 100755
--- a/install/rhel/6/wsgi/httpd/wsgi.stpl
+++ b/install/rhel/6/wsgi/httpd/wsgi.stpl
@@ -43,7 +43,7 @@
         Allow from all
     </Directory>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/6/wsgi/httpd/wsgi.tpl b/install/rhel/6/wsgi/httpd/wsgi.tpl
index 5d80a92b5..ad5d8a076 100644
--- a/install/rhel/6/wsgi/httpd/wsgi.tpl
+++ b/install/rhel/6/wsgi/httpd/wsgi.tpl
@@ -38,7 +38,7 @@
         Allow from all
     </Directory>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/basedir.stpl b/install/rhel/7/templates/web/httpd/basedir.stpl
index 903798dc3..952215394 100644
--- a/install/rhel/7/templates/web/httpd/basedir.stpl
+++ b/install/rhel/7/templates/web/httpd/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/basedir.tpl b/install/rhel/7/templates/web/httpd/basedir.tpl
index b09d36df1..e1f86c704 100644
--- a/install/rhel/7/templates/web/httpd/basedir.tpl
+++ b/install/rhel/7/templates/web/httpd/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/default.stpl b/install/rhel/7/templates/web/httpd/default.stpl
index c8cc672fe..c63dd270b 100644
--- a/install/rhel/7/templates/web/httpd/default.stpl
+++ b/install/rhel/7/templates/web/httpd/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/default.tpl b/install/rhel/7/templates/web/httpd/default.tpl
index 041f22716..558687619 100644
--- a/install/rhel/7/templates/web/httpd/default.tpl
+++ b/install/rhel/7/templates/web/httpd/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/hosting.stpl b/install/rhel/7/templates/web/httpd/hosting.stpl
index 7f17a1994..673c9c017 100644
--- a/install/rhel/7/templates/web/httpd/hosting.stpl
+++ b/install/rhel/7/templates/web/httpd/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/hosting.tpl b/install/rhel/7/templates/web/httpd/hosting.tpl
index ee323a8f2..25f8e3bf9 100644
--- a/install/rhel/7/templates/web/httpd/hosting.tpl
+++ b/install/rhel/7/templates/web/httpd/hosting.tpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/phpcgi.stpl b/install/rhel/7/templates/web/httpd/phpcgi.stpl
index 1b9324c00..1f7b3547a 100644
--- a/install/rhel/7/templates/web/httpd/phpcgi.stpl
+++ b/install/rhel/7/templates/web/httpd/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/shttpd.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/phpcgi.tpl b/install/rhel/7/templates/web/httpd/phpcgi.tpl
index 6e7c8f42a..c0ae62082 100644
--- a/install/rhel/7/templates/web/httpd/phpcgi.tpl
+++ b/install/rhel/7/templates/web/httpd/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/httpd.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.stpl b/install/rhel/7/templates/web/httpd/phpfcgid.stpl
index aaf7bcc6b..6d7e81df7 100644
--- a/install/rhel/7/templates/web/httpd/phpfcgid.stpl
+++ b/install/rhel/7/templates/web/httpd/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/shttpd.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/shttpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.tpl b/install/rhel/7/templates/web/httpd/phpfcgid.tpl
index ddead2e0f..79d26209b 100644
--- a/install/rhel/7/templates/web/httpd/phpfcgid.tpl
+++ b/install/rhel/7/templates/web/httpd/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/httpd.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/httpd.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/templates/web/nginx/caching.stpl b/install/rhel/7/templates/web/nginx/caching.stpl
index f027bbc4a..67b2f6c20 100755
--- a/install/rhel/7/templates/web/nginx/caching.stpl
+++ b/install/rhel/7/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/caching.tpl b/install/rhel/7/templates/web/nginx/caching.tpl
index fb774a1a8..6d727c67f 100755
--- a/install/rhel/7/templates/web/nginx/caching.tpl
+++ b/install/rhel/7/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/default.stpl b/install/rhel/7/templates/web/nginx/default.stpl
index 52d445b31..53ad8d1b8 100755
--- a/install/rhel/7/templates/web/nginx/default.stpl
+++ b/install/rhel/7/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/7/templates/web/nginx/default.tpl b/install/rhel/7/templates/web/nginx/default.tpl
index e34af0c26..c1fec114f 100755
--- a/install/rhel/7/templates/web/nginx/default.tpl
+++ b/install/rhel/7/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/7/templates/web/nginx/hosting.stpl b/install/rhel/7/templates/web/nginx/hosting.stpl
index 3a4e0a753..aca458a4b 100755
--- a/install/rhel/7/templates/web/nginx/hosting.stpl
+++ b/install/rhel/7/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/7/templates/web/nginx/hosting.tpl b/install/rhel/7/templates/web/nginx/hosting.tpl
index d7ffb37b4..44d874962 100755
--- a/install/rhel/7/templates/web/nginx/hosting.tpl
+++ b/install/rhel/7/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/default.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/default.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl b/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl b/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/opencart.tpl b/install/rhel/7/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/rhel/7/wsgi/httpd/wsgi.stpl b/install/rhel/7/wsgi/httpd/wsgi.stpl
index 3e4e45766..e2fdd3f40 100755
--- a/install/rhel/7/wsgi/httpd/wsgi.stpl
+++ b/install/rhel/7/wsgi/httpd/wsgi.stpl
@@ -43,7 +43,7 @@
         Allow from all
     </Directory>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/rhel/7/wsgi/httpd/wsgi.tpl b/install/rhel/7/wsgi/httpd/wsgi.tpl
index 5d80a92b5..ad5d8a076 100644
--- a/install/rhel/7/wsgi/httpd/wsgi.tpl
+++ b/install/rhel/7/wsgi/httpd/wsgi.tpl
@@ -38,7 +38,7 @@
         Allow from all
     </Directory>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl
index a58eefc17..dda3aa760 100644
--- a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl
index bac58f258..9449bc447 100644
--- a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/default.stpl b/install/ubuntu/12.04/templates/web/apache2/default.stpl
index e9866ef58..269c09711 100644
--- a/install/ubuntu/12.04/templates/web/apache2/default.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/default.tpl b/install/ubuntu/12.04/templates/web/apache2/default.tpl
index 7f0eacf94..c24b12796 100644
--- a/install/ubuntu/12.04/templates/web/apache2/default.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl
index d65291db7..627325e06 100644
--- a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl
index 39f3249ae..3e30d737b 100644
--- a/install/ubuntu/12.04/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl
index 1b8fddb5d..aa807091a 100644
--- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl
index d650e2aed..fd603800b 100644
--- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl
index 996541585..88cea0e64 100644
--- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl
index 1f9f912f9..335b9f620 100644
--- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.stpl b/install/ubuntu/12.04/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/12.04/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.tpl b/install/ubuntu/12.04/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/12.04/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/default.stpl b/install/ubuntu/12.04/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/12.04/templates/web/nginx/default.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/default.tpl b/install/ubuntu/12.04/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/12.04/templates/web/nginx/default.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl
index a58eefc17..dda3aa760 100644
--- a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl
index bac58f258..9449bc447 100644
--- a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/default.stpl b/install/ubuntu/12.10/templates/web/apache2/default.stpl
index e9866ef58..269c09711 100644
--- a/install/ubuntu/12.10/templates/web/apache2/default.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/default.tpl b/install/ubuntu/12.10/templates/web/apache2/default.tpl
index 7f0eacf94..c24b12796 100644
--- a/install/ubuntu/12.10/templates/web/apache2/default.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl
index d65291db7..627325e06 100644
--- a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl
index 39f3249ae..3e30d737b 100644
--- a/install/ubuntu/12.10/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl
index 1b8fddb5d..aa807091a 100644
--- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl
index d650e2aed..fd603800b 100644
--- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl
index 996541585..88cea0e64 100644
--- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl
index 1f9f912f9..335b9f620 100644
--- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.stpl b/install/ubuntu/12.10/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/12.10/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.tpl b/install/ubuntu/12.10/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/12.10/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/default.stpl b/install/ubuntu/12.10/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/12.10/templates/web/nginx/default.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/default.tpl b/install/ubuntu/12.10/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/12.10/templates/web/nginx/default.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl
index a58eefc17..dda3aa760 100644
--- a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl
index bac58f258..9449bc447 100644
--- a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/default.stpl b/install/ubuntu/13.04/templates/web/apache2/default.stpl
index e9866ef58..269c09711 100644
--- a/install/ubuntu/13.04/templates/web/apache2/default.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/default.tpl b/install/ubuntu/13.04/templates/web/apache2/default.tpl
index 7f0eacf94..c24b12796 100644
--- a/install/ubuntu/13.04/templates/web/apache2/default.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl
index 69866b9ef..ce0763ae8 100644
--- a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl
@@ -44,7 +44,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl
index ef18dccfd..f3491a5fe 100644
--- a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl
index 1b8fddb5d..aa807091a 100644
--- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl
index d650e2aed..fd603800b 100644
--- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl
index 996541585..88cea0e64 100644
--- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl
index 1f9f912f9..335b9f620 100644
--- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.stpl b/install/ubuntu/13.04/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/13.04/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.tpl b/install/ubuntu/13.04/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/13.04/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/default.stpl b/install/ubuntu/13.04/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/13.04/templates/web/nginx/default.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/default.tpl b/install/ubuntu/13.04/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/13.04/templates/web/nginx/default.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/apache2/basedir.stpl b/install/ubuntu/13.10/templates/web/apache2/basedir.stpl
index cc3596a47..d978d4c43 100644
--- a/install/ubuntu/13.10/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/13.10/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/basedir.tpl b/install/ubuntu/13.10/templates/web/apache2/basedir.tpl
index 8e4f56913..96c94a1bd 100644
--- a/install/ubuntu/13.10/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/13.10/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/default.stpl b/install/ubuntu/13.10/templates/web/apache2/default.stpl
index 557cb2385..a7faa7219 100644
--- a/install/ubuntu/13.10/templates/web/apache2/default.stpl
+++ b/install/ubuntu/13.10/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/default.tpl b/install/ubuntu/13.10/templates/web/apache2/default.tpl
index fe7120146..3a2270156 100644
--- a/install/ubuntu/13.10/templates/web/apache2/default.tpl
+++ b/install/ubuntu/13.10/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl
index ba751fe83..8892072b1 100644
--- a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.tpl b/install/ubuntu/13.10/templates/web/apache2/hosting.tpl
index 207e0bbe4..1eb269103 100644
--- a/install/ubuntu/13.10/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/13.10/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl
index 3c34cf358..731355bc1 100644
--- a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl
index 09cee0ac1..c6796d29c 100644
--- a/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl
index ea57c32aa..156c8a918 100644
--- a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl
index ed799c723..a4c012690 100644
--- a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.stpl b/install/ubuntu/13.10/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/13.10/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.tpl b/install/ubuntu/13.10/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/13.10/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/default.stpl b/install/ubuntu/13.10/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/13.10/templates/web/nginx/default.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/default.tpl b/install/ubuntu/13.10/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/13.10/templates/web/nginx/default.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.stpl b/install/ubuntu/14.04/templates/web/apache2/basedir.stpl
index cc3596a47..d978d4c43 100644
--- a/install/ubuntu/14.04/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/14.04/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.tpl b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl
index 8e4f56913..96c94a1bd 100644
--- a/install/ubuntu/14.04/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/default.stpl b/install/ubuntu/14.04/templates/web/apache2/default.stpl
index 557cb2385..a7faa7219 100644
--- a/install/ubuntu/14.04/templates/web/apache2/default.stpl
+++ b/install/ubuntu/14.04/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/default.tpl b/install/ubuntu/14.04/templates/web/apache2/default.tpl
index fe7120146..3a2270156 100644
--- a/install/ubuntu/14.04/templates/web/apache2/default.tpl
+++ b/install/ubuntu/14.04/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl
index ba751fe83..8892072b1 100644
--- a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.tpl b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl
index 207e0bbe4..1eb269103 100644
--- a/install/ubuntu/14.04/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl
index 3c34cf358..731355bc1 100644
--- a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl
index 09cee0ac1..c6796d29c 100644
--- a/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl
index ea57c32aa..156c8a918 100644
--- a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl
index ed799c723..a4c012690 100644
--- a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.stpl b/install/ubuntu/14.04/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/14.04/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.tpl b/install/ubuntu/14.04/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/14.04/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/default.stpl b/install/ubuntu/14.04/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/14.04/templates/web/nginx/default.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/default.tpl b/install/ubuntu/14.04/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/14.04/templates/web/nginx/default.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/apache2/basedir.stpl b/install/ubuntu/14.10/templates/web/apache2/basedir.stpl
index cc3596a47..d978d4c43 100644
--- a/install/ubuntu/14.10/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/14.10/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/basedir.tpl b/install/ubuntu/14.10/templates/web/apache2/basedir.tpl
index 8e4f56913..96c94a1bd 100644
--- a/install/ubuntu/14.10/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/14.10/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/default.stpl b/install/ubuntu/14.10/templates/web/apache2/default.stpl
index 557cb2385..a7faa7219 100644
--- a/install/ubuntu/14.10/templates/web/apache2/default.stpl
+++ b/install/ubuntu/14.10/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/default.tpl b/install/ubuntu/14.10/templates/web/apache2/default.tpl
index fe7120146..3a2270156 100644
--- a/install/ubuntu/14.10/templates/web/apache2/default.tpl
+++ b/install/ubuntu/14.10/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl
index ba751fe83..8892072b1 100644
--- a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.tpl b/install/ubuntu/14.10/templates/web/apache2/hosting.tpl
index 207e0bbe4..1eb269103 100644
--- a/install/ubuntu/14.10/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/14.10/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl
index 3c34cf358..731355bc1 100644
--- a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl
index 09cee0ac1..c6796d29c 100644
--- a/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl
index ea57c32aa..156c8a918 100644
--- a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl
index ed799c723..a4c012690 100644
--- a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.stpl b/install/ubuntu/14.10/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/14.10/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.tpl b/install/ubuntu/14.10/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/14.10/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/default.stpl b/install/ubuntu/14.10/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/14.10/templates/web/nginx/default.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/default.tpl b/install/ubuntu/14.10/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/14.10/templates/web/nginx/default.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/apache2/basedir.stpl b/install/ubuntu/15.04/templates/web/apache2/basedir.stpl
index cc3596a47..d978d4c43 100644
--- a/install/ubuntu/15.04/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/15.04/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/basedir.tpl b/install/ubuntu/15.04/templates/web/apache2/basedir.tpl
index 8e4f56913..96c94a1bd 100644
--- a/install/ubuntu/15.04/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/15.04/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/default.stpl b/install/ubuntu/15.04/templates/web/apache2/default.stpl
index 557cb2385..a7faa7219 100644
--- a/install/ubuntu/15.04/templates/web/apache2/default.stpl
+++ b/install/ubuntu/15.04/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/default.tpl b/install/ubuntu/15.04/templates/web/apache2/default.tpl
index fe7120146..3a2270156 100644
--- a/install/ubuntu/15.04/templates/web/apache2/default.tpl
+++ b/install/ubuntu/15.04/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl
index ba751fe83..8892072b1 100644
--- a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.tpl b/install/ubuntu/15.04/templates/web/apache2/hosting.tpl
index 207e0bbe4..1eb269103 100644
--- a/install/ubuntu/15.04/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/15.04/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl
index 3c34cf358..731355bc1 100644
--- a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl
index 09cee0ac1..c6796d29c 100644
--- a/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl
index ea57c32aa..156c8a918 100644
--- a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl
index ed799c723..a4c012690 100644
--- a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.stpl b/install/ubuntu/15.04/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/15.04/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.tpl b/install/ubuntu/15.04/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/15.04/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/default.stpl b/install/ubuntu/15.04/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/15.04/templates/web/nginx/default.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/default.tpl b/install/ubuntu/15.04/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/15.04/templates/web/nginx/default.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl
index 1f7ce3084..f44fd736a 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl
index cc3596a47..d978d4c43 100644
--- a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl
@@ -38,7 +38,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.tpl b/install/ubuntu/15.10/templates/web/apache2/basedir.tpl
index 8e4f56913..96c94a1bd 100644
--- a/install/ubuntu/15.10/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/15.10/templates/web/apache2/basedir.tpl
@@ -32,7 +32,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/default.stpl b/install/ubuntu/15.10/templates/web/apache2/default.stpl
index 557cb2385..a7faa7219 100644
--- a/install/ubuntu/15.10/templates/web/apache2/default.stpl
+++ b/install/ubuntu/15.10/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/default.tpl b/install/ubuntu/15.10/templates/web/apache2/default.tpl
index fe7120146..3a2270156 100644
--- a/install/ubuntu/15.10/templates/web/apache2/default.tpl
+++ b/install/ubuntu/15.10/templates/web/apache2/default.tpl
@@ -31,7 +31,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl
index ba751fe83..8892072b1 100644
--- a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.tpl b/install/ubuntu/15.10/templates/web/apache2/hosting.tpl
index 207e0bbe4..1eb269103 100644
--- a/install/ubuntu/15.10/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/15.10/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl
index 3c34cf358..731355bc1 100644
--- a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl
index 09cee0ac1..c6796d29c 100644
--- a/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl
index ea57c32aa..156c8a918 100644
--- a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl
index ed799c723..a4c012690 100644
--- a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.tpl
@@ -25,7 +25,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.stpl b/install/ubuntu/15.10/templates/web/nginx/caching.stpl
index 0652d3297..5e0e40641 100755
--- a/install/ubuntu/15.10/templates/web/nginx/caching.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/caching.stpl
@@ -40,5 +40,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.tpl b/install/ubuntu/15.10/templates/web/nginx/caching.tpl
index 9bb2fdd1d..36761b65c 100755
--- a/install/ubuntu/15.10/templates/web/nginx/caching.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/caching.tpl
@@ -37,5 +37,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/default.stpl b/install/ubuntu/15.10/templates/web/nginx/default.stpl
index 55bc285ca..fa5380606 100755
--- a/install/ubuntu/15.10/templates/web/nginx/default.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/default.stpl
@@ -31,6 +31,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/default.tpl b/install/ubuntu/15.10/templates/web/nginx/default.tpl
index 79cf7680b..4d5c774bc 100755
--- a/install/ubuntu/15.10/templates/web/nginx/default.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/default.tpl
@@ -28,6 +28,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl
index 40b8c289b..d778d6333 100755
--- a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl
@@ -33,6 +33,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl
index 4e428a9e3..15961c95c 100755
--- a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl
@@ -30,6 +30,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
index 2ea6dbfe7..4a11965f7 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
index c51807860..a30769d4a 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl
index ef34746f8..b342725b7 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl
@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl
index de811555c..e2948f2d9 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.tpl
@@ -53,5 +53,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl
index de77cf0cf..ae915ae84 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl
index edf6ef6da..e85c29d11 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.tpl
@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl
index 7a780e6e2..84267e7dc 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl
@@ -123,5 +123,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl
index a1653d6a3..c557670fa 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.tpl
@@ -119,5 +119,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/default.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl
index f12a9643c..6eabd7d5e 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl
index 413d49dda..861c3dee1 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl
index 8a6d7f12a..75ba711f6 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl
index 390c3e6e6..3d7c04995 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl
index ac116bf37..5c18ee250 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl
@@ -97,5 +97,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl
index 11e6555d2..1f9c2fc96 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl
@@ -94,5 +94,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl
index a8ec93852..c93fab958 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl
@@ -98,5 +98,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl
index ad4a6e075..ed0213a59 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl
@@ -95,5 +95,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl
index d90af7046..7f2114c99 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl
index bbc4ecac8..8070f6d50 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.tpl
@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl
index 21665b23e..bc557126e 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl
index 98200c35c..6c89d7bb3 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.tpl
@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl
index 83b5f3613..18d25f066 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl
@@ -86,5 +86,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl
index d5b185f0d..69f50963a 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.tpl
@@ -83,5 +83,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl
index 0ba7a96c6..c03491a0f 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.stpl
@@ -43,5 +43,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl
index f525f4a28..b56a9f398 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/no-php.tpl
@@ -39,5 +39,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl
index 07e650bd3..92b65bc26 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl
@@ -81,5 +81,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl
index cb26067c3..d3496b0ff 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.tpl
@@ -77,5 +77,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl
index b00b6cb18..b137067f5 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl
@@ -69,5 +69,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl
index 05098e484..1e9de371d 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.tpl
@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl
index 9426dde2b..dd5acb2f7 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl
index 65b99f51d..b92177516 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl
@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl
index 1443d8784..25b8d08c9 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl
@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl
index 0e734ec6b..ad11ffcda 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.tpl
@@ -47,5 +47,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl
index bb3007b10..4baa85037 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl
@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl
index c5051eedf..e3e073921 100644
--- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl
+++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.tpl
@@ -59,5 +59,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl
index 112b668e5..08c0d4946 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl
@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl
index afcd44cab..79d8a464e 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl
@@ -46,5 +46,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl
index 1f9aa2bdc..68e464808 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl
@@ -194,5 +194,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl
index d802868b4..1287a1e7f 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl
@@ -190,5 +190,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl
index 6dd5377e8..f84829cee 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.stpl
@@ -66,5 +66,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl
index 3eb67e4c0..7bfe61922 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/odoo.tpl
@@ -62,5 +62,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/opencart.tpl
index a6dec43bb..65c98c0d8 100644
--- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/opencart.tpl
+++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/opencart.tpl
@@ -45,5 +45,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain_idn%.conf*;
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
 }
diff --git a/upd/fix_nginx_auth.sh b/upd/fix_nginx_auth.sh
index eed5f1b9c..5bed57905 100755
--- a/upd/fix_nginx_auth.sh
+++ b/upd/fix_nginx_auth.sh
@@ -3,13 +3,13 @@
 source /etc/profile.d/vesta.sh
 source /usr/local/vesta/conf/vesta.conf
 
-#if [ "$WEB_SYSTEM" != 'nginx' ]; then
-#    exit
-#fi
-
 sed -i "s|web/%domain%/stats/auth.*|conf/web/%domain%.auth|" \
     $VESTA/data/templates/web/nginx/*/*tpl >/dev/null 2>&1
 
+if [ "$WEB_SYSTEM" != 'nginx' ]; then
+    exit
+fi
+
 check=`egrep "STATS_USER='([0-9]|[a-Z].*)'" $VESTA/data/users/*/web.conf`
 if [ ! -z "$check" ]; then
     for user in $(echo $check |cut -f1 -d: |cut -f7 -d/); do
diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php
index c169f206e..9d58b3816 100644
--- a/web/inc/i18n/cn.php
+++ b/web/inc/i18n/cn.php
@@ -1,8 +1,12 @@
 <?php
 /**
  * Vesta language file
- * 浩浩 (github@myrevery.com) Feedback: https://myrevery.com/tag/vestacp
- * Kevin (kevin@kvm.la)
+ * 浩浩 (github#myrevery.com) Feedback: https://myrevery.com/tag/vestacp
+ * Kevin (kevin#kvm.la)
+ * Tips:
+ * 欢迎大家参与完善此翻译档，但请慎重选择最终中文字词
+ * 首先请勿使用口语化简略词，同时还应考虑字符长度及排列方式对Web页面布局的影响
+ * 请针对显示设备的各种尺寸、比例、分辨率及不同缩放率等进行测试确保无误后再发布
  */
 
 $LANG['cn'] = array(
@@ -192,13 +196,13 @@ $LANG['cn'] = array(
     'Backup System' => '备份系统',
     'backup exclusions' => '备份排除项目',
     'template' => '模板',
-    'SSL Support' => '使用SSL',
-    'SSL Home Directory' => 'SSL站点根目录',
-    'Lets Encrypt Support'  => '使用Let&#39s Encrypt',
+    'SSL Support' => '启用SSL',
+    'SSL Home Directory' => 'SSL站点主目录',
+    'Lets Encrypt Support'  => '采用 Let&#39s Encrypt',
     'Lets Encrypt'  => 'Let&#39s Encrypt',
     'Your certificate will be automatically issued in 5 minutes' => '证书将在5分钟内自动签发完成',
-    'Proxy Support' => '使用反向代理',
-    'Proxy Extensions' => '反代的文件类型',
+    'Proxy Support' => '反向代理',
+    'Proxy Extensions' => '代理的文件扩展名',
     'Web Statistics' => '网站统计',
     'Additional FTP Account' => '额外的FTP账户',
     'Path'  => '路径',
@@ -706,9 +710,9 @@ $LANG['cn'] = array(
     'Disable and Cancel Licence' => '停用并取消许可',
     'Licence Activated' => '许可已激活',
     'Licence Deactivated' => '许可已停用',
-    'Restrict users so that they cannot use SSH and access only their home directory.' => '限制用户 只能通过 SSH 访问自己的主目录。',
+    'Restrict users so that they cannot use SSH and access only their home directory.' => '限制用户，使他们通过 SSH 只能访问自己的主目录。',
     'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '功能全面的文件管理器，浏览，复制，编辑，查看和检索你的 Web 文件。',
-    'This is a commercial module, you would need to purchace license key to enable it.' => '这是商业模块，请购买许可密匙再启用。',
+    'This is a commercial module, you would need to purchace license key to enable it.' => '这是商业模块，请购买许可密匙来启用它。',
 
     'Minutes' => '分钟',
     'Hourly' => '小时',
@@ -754,7 +758,7 @@ $LANG['cn'] = array(
     'No encryption' => '不加密',
     'Do not use encryption' => '不使用加密',
 
-    'maximum characters length, including prefix' => '包括前缀最多 %s 个字符',
+    'maximum characters length, including prefix' => '包含前缀最多 %s 个字符',
 
     'Email Credentials' => '电子邮件证书',
 );