diff --git a/install/debian/7/templates/web/apache2/basedir.stpl b/install/debian/7/templates/web/apache2/basedir.stpl
index a58eefc1..dda3aa76 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 bac58f25..9449bc44 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 e9866ef5..269c0971 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 7f0eacf9..c24b1279 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 d65291db..627325e0 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 ba702184..0bdd6ea6 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 1b8fddb5..aa807091 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 d650e2ae..fd603800 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 99654158..88cea0e6 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 1f9f912f..335b9f62 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 cc3596a4..d978d4c4 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 8e4f5691..96c94a1b 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 557cb238..a7faa721 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 fe712014..3a227015 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 ba751fe8..8892072b 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 207e0bbe..1eb26910 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 3c34cf35..731355bc 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 09cee0ac..c6796d29 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 ea57c32a..156c8a91 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 ed799c72..a4c01269 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 aaeb60d5..52641dbe 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 5aa2a865..4ced9f38 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 76b5b5d6..566c9884 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 31ddb61c..cd4a8c88 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 f877cd90..94288db0 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 1a3ed8fb..f94ba186 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 24c83fbc..1d3dd354 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 2ef22353..591693a4 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 dd15efa5..114c6a52 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 ebc7f30a..3bb82cca 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 95d43e62..f4e4f472 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 f027bbc4..67b2f6c2 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 fb774a1a..6d727c67 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 52d445b3..53ad8d1b 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 e34af0c2..c1fec114 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 3a4e0a75..aca458a4 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 d7ffb37b..44d87496 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 3e4e4576..e2fdd3f4 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 5d80a92b..ad5d8a07 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 5aa2a865..4ced9f38 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 76b5b5d6..566c9884 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 31ddb61c..cd4a8c88 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 f877cd90..94288db0 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 3d7cb565..f1c1c111 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 c5d52e74..65bf20fd 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 2ef22353..591693a4 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 dd15efa5..114c6a52 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 ebc7f30a..3bb82cca 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 95d43e62..f4e4f472 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 f027bbc4..67b2f6c2 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 fb774a1a..6d727c67 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 52d445b3..53ad8d1b 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 e34af0c2..c1fec114 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 3a4e0a75..aca458a4 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 d7ffb37b..44d87496 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 3e4e4576..e2fdd3f4 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 5d80a92b..ad5d8a07 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 903798dc..95221539 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 b09d36df..e1f86c70 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 c8cc672f..c63dd270 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 041f2271..55868761 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 7f17a199..673c9c01 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 ee323a8f..25f8e3bf 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 1b9324c0..1f7b3547 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 6e7c8f42..c0ae6208 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 aaf7bcc6..6d7e81df 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 ddead2e0..79d26209 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 f027bbc4..67b2f6c2 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 fb774a1a..6d727c67 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 52d445b3..53ad8d1b 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 e34af0c2..c1fec114 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 3a4e0a75..aca458a4 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 d7ffb37b..44d87496 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 3e4e4576..e2fdd3f4 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 5d80a92b..ad5d8a07 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 a58eefc1..dda3aa76 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 bac58f25..9449bc44 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 e9866ef5..269c0971 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 7f0eacf9..c24b1279 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 d65291db..627325e0 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 39f3249a..3e30d737 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 1b8fddb5..aa807091 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 d650e2ae..fd603800 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 99654158..88cea0e6 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 1f9f912f..335b9f62 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 a58eefc1..dda3aa76 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 bac58f25..9449bc44 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 e9866ef5..269c0971 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 7f0eacf9..c24b1279 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 d65291db..627325e0 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 39f3249a..3e30d737 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 1b8fddb5..aa807091 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 d650e2ae..fd603800 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 99654158..88cea0e6 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 1f9f912f..335b9f62 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 a58eefc1..dda3aa76 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 bac58f25..9449bc44 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 e9866ef5..269c0971 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 7f0eacf9..c24b1279 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 69866b9e..ce0763ae 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 ef18dccf..f3491a5f 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 1b8fddb5..aa807091 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 d650e2ae..fd603800 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 99654158..88cea0e6 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 1f9f912f..335b9f62 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 cc3596a4..d978d4c4 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 8e4f5691..96c94a1b 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 557cb238..a7faa721 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 fe712014..3a227015 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 ba751fe8..8892072b 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 207e0bbe..1eb26910 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 3c34cf35..731355bc 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 09cee0ac..c6796d29 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 ea57c32a..156c8a91 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 ed799c72..a4c01269 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 cc3596a4..d978d4c4 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 8e4f5691..96c94a1b 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 557cb238..a7faa721 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 fe712014..3a227015 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 ba751fe8..8892072b 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 207e0bbe..1eb26910 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 3c34cf35..731355bc 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 09cee0ac..c6796d29 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 ea57c32a..156c8a91 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 ed799c72..a4c01269 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 cc3596a4..d978d4c4 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 8e4f5691..96c94a1b 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 557cb238..a7faa721 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 fe712014..3a227015 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 ba751fe8..8892072b 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 207e0bbe..1eb26910 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 3c34cf35..731355bc 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 09cee0ac..c6796d29 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 ea57c32a..156c8a91 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 ed799c72..a4c01269 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 cc3596a4..d978d4c4 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 8e4f5691..96c94a1b 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 557cb238..a7faa721 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 fe712014..3a227015 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 ba751fe8..8892072b 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 207e0bbe..1eb26910 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 3c34cf35..731355bc 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 09cee0ac..c6796d29 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 ea57c32a..156c8a91 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 ed799c72..a4c01269 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 1f7ce308..f44fd736 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 cc3596a4..d978d4c4 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 8e4f5691..96c94a1b 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 557cb238..a7faa721 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 fe712014..3a227015 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 ba751fe8..8892072b 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 207e0bbe..1eb26910 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 3c34cf35..731355bc 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 09cee0ac..c6796d29 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 ea57c32a..156c8a91 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 ed799c72..a4c01269 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 0652d329..5e0e4064 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 9bb2fdd1..36761b65 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 55bc285c..fa538060 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 79cf7680..4d5c774b 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 40b8c289..d778d633 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 4e428a9e..15961c95 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 2ea6dbfe..4a11965f 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 c5180786..a30769d4 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 ef34746f..b342725b 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 de811555..e2948f2d 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 de77cf0c..ae915ae8 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 edf6ef6d..e85c29d1 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 7a780e6e..84267e7d 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 a1653d6a..c557670f 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 f12a9643..6eabd7d5 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 413d49dd..861c3dee 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 8a6d7f12..75ba711f 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 390c3e6e..3d7c0499 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 ac116bf3..5c18ee25 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 11e6555d..1f9c2fc9 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 a8ec9385..c93fab95 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 ad4a6e07..ed0213a5 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 d90af704..7f2114c9 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 bbc4ecac..8070f6d5 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 21665b23..bc557126 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 98200c35..6c89d7bb 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 83b5f361..18d25f06 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 d5b185f0..69f50963 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 0ba7a96c..c03491a0 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 f525f4a2..b56a9f39 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 07e650bd..92b65bc2 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 cb26067c..d3496b0f 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 b00b6cb1..b137067f 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 05098e48..1e9de371 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 9426dde2..dd5acb2f 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 65b99f51..b9217751 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 1443d878..25b8d08c 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 0e734ec6..ad11ffcd 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 bb3007b1..4baa8503 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 c5051eed..e3e07392 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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 112b668e..08c0d494 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 afcd44ca..79d8a464 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 1f9aa2bd..68e46480 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 d802868b..1287a1e7 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 6dd5377e..f84829ce 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 3eb67e4c..7bfe6192 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 a6dec43b..65c98c0d 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*;
 }