diff --git a/.gitignore b/.gitignore
index 980bc5b3c..d6ed513fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.tar
 *.zip
 *.gzip
+*.gz
diff --git a/install/debian/7/dovecot.tar.gz b/install/debian/7/dovecot.tar.gz
index 91a55bc09..64d371a5c 100644
Binary files a/install/debian/7/dovecot.tar.gz and b/install/debian/7/dovecot.tar.gz differ
diff --git a/install/debian/7/fail2ban.tar.gz b/install/debian/7/fail2ban.tar.gz
index a2bf42b72..796906278 100644
Binary files a/install/debian/7/fail2ban.tar.gz and b/install/debian/7/fail2ban.tar.gz differ
diff --git a/install/debian/7/firewall.tar.gz b/install/debian/7/firewall.tar.gz
index a98e20010..b0f3f81c5 100644
Binary files a/install/debian/7/firewall.tar.gz and b/install/debian/7/firewall.tar.gz differ
diff --git a/install/debian/7/packages.tar.gz b/install/debian/7/packages.tar.gz
index c692568f1..5c834ca69 100644
Binary files a/install/debian/7/packages.tar.gz and b/install/debian/7/packages.tar.gz differ
diff --git a/install/debian/7/templates.tar.gz b/install/debian/7/templates.tar.gz
index 3da0cec2c..0dd30d9d4 100644
Binary files a/install/debian/7/templates.tar.gz and b/install/debian/7/templates.tar.gz differ
diff --git a/install/debian/8/dovecot.tar.gz b/install/debian/8/dovecot.tar.gz
index 91a55bc09..64d371a5c 100644
Binary files a/install/debian/8/dovecot.tar.gz and b/install/debian/8/dovecot.tar.gz differ
diff --git a/install/debian/8/fail2ban.tar.gz b/install/debian/8/fail2ban.tar.gz
index a2bf42b72..796906278 100644
Binary files a/install/debian/8/fail2ban.tar.gz and b/install/debian/8/fail2ban.tar.gz differ
diff --git a/install/debian/8/firewall.tar.gz b/install/debian/8/firewall.tar.gz
index a98e20010..b0f3f81c5 100644
Binary files a/install/debian/8/firewall.tar.gz and b/install/debian/8/firewall.tar.gz differ
diff --git a/install/debian/8/packages.tar.gz b/install/debian/8/packages.tar.gz
index c692568f1..5c834ca69 100644
Binary files a/install/debian/8/packages.tar.gz and b/install/debian/8/packages.tar.gz differ
diff --git a/install/debian/8/templates.tar.gz b/install/debian/8/templates.tar.gz
index 0f1c99e87..e10686f2e 100644
Binary files a/install/debian/8/templates.tar.gz and b/install/debian/8/templates.tar.gz differ
diff --git a/install/rhel/5/dovecot.tar.gz b/install/rhel/5/dovecot.tar.gz
index c17fafea8..4b36a9b9c 100644
Binary files a/install/rhel/5/dovecot.tar.gz and b/install/rhel/5/dovecot.tar.gz differ
diff --git a/install/rhel/5/fail2ban.tar.gz b/install/rhel/5/fail2ban.tar.gz
index 42dbaba59..833b186d6 100644
Binary files a/install/rhel/5/fail2ban.tar.gz and b/install/rhel/5/fail2ban.tar.gz differ
diff --git a/install/rhel/5/firewall.tar.gz b/install/rhel/5/firewall.tar.gz
index dcef27e67..1e5578bb0 100644
Binary files a/install/rhel/5/firewall.tar.gz and b/install/rhel/5/firewall.tar.gz differ
diff --git a/install/rhel/5/packages.tar.gz b/install/rhel/5/packages.tar.gz
index da37c520e..956ebd366 100644
Binary files a/install/rhel/5/packages.tar.gz and b/install/rhel/5/packages.tar.gz differ
diff --git a/install/rhel/5/templates.tar.gz b/install/rhel/5/templates.tar.gz
index a7c145d99..05dbb391e 100644
Binary files a/install/rhel/5/templates.tar.gz and b/install/rhel/5/templates.tar.gz differ
diff --git a/install/rhel/6/dovecot.tar.gz b/install/rhel/6/dovecot.tar.gz
index 3ce714be0..f3b19a59c 100644
Binary files a/install/rhel/6/dovecot.tar.gz and b/install/rhel/6/dovecot.tar.gz differ
diff --git a/install/rhel/6/fail2ban.tar.gz b/install/rhel/6/fail2ban.tar.gz
index 42dbaba59..833b186d6 100644
Binary files a/install/rhel/6/fail2ban.tar.gz and b/install/rhel/6/fail2ban.tar.gz differ
diff --git a/install/rhel/6/firewall.tar.gz b/install/rhel/6/firewall.tar.gz
index dcef27e67..1e5578bb0 100644
Binary files a/install/rhel/6/firewall.tar.gz and b/install/rhel/6/firewall.tar.gz differ
diff --git a/install/rhel/6/packages.tar.gz b/install/rhel/6/packages.tar.gz
index da37c520e..956ebd366 100644
Binary files a/install/rhel/6/packages.tar.gz and b/install/rhel/6/packages.tar.gz differ
diff --git a/install/rhel/6/templates.tar.gz b/install/rhel/6/templates.tar.gz
index d1133a1fc..4aabc113f 100644
Binary files a/install/rhel/6/templates.tar.gz and b/install/rhel/6/templates.tar.gz differ
diff --git a/install/rhel/7/dovecot.tar.gz b/install/rhel/7/dovecot.tar.gz
index da2560979..0b73120fd 100644
Binary files a/install/rhel/7/dovecot.tar.gz and b/install/rhel/7/dovecot.tar.gz differ
diff --git a/install/rhel/7/fail2ban.tar.gz b/install/rhel/7/fail2ban.tar.gz
index 42dbaba59..833b186d6 100644
Binary files a/install/rhel/7/fail2ban.tar.gz and b/install/rhel/7/fail2ban.tar.gz differ
diff --git a/install/rhel/7/firewall.tar.gz b/install/rhel/7/firewall.tar.gz
index dcef27e67..1e5578bb0 100644
Binary files a/install/rhel/7/firewall.tar.gz and b/install/rhel/7/firewall.tar.gz differ
diff --git a/install/rhel/7/packages.tar.gz b/install/rhel/7/packages.tar.gz
index da37c520e..956ebd366 100644
Binary files a/install/rhel/7/packages.tar.gz and b/install/rhel/7/packages.tar.gz differ
diff --git a/install/rhel/7/templates.tar.gz b/install/rhel/7/templates.tar.gz
index b569f8485..90a5b668d 100644
Binary files a/install/rhel/7/templates.tar.gz and b/install/rhel/7/templates.tar.gz differ
diff --git a/install/ubuntu/12.04/dovecot.tar.gz b/install/ubuntu/12.04/dovecot.tar.gz
index 40d9292b2..381067f70 100644
Binary files a/install/ubuntu/12.04/dovecot.tar.gz and b/install/ubuntu/12.04/dovecot.tar.gz differ
diff --git a/install/ubuntu/12.04/fail2ban.tar.gz b/install/ubuntu/12.04/fail2ban.tar.gz
index 9ea57f770..9067be54e 100644
Binary files a/install/ubuntu/12.04/fail2ban.tar.gz and b/install/ubuntu/12.04/fail2ban.tar.gz differ
diff --git a/install/ubuntu/12.04/firewall.tar.gz b/install/ubuntu/12.04/firewall.tar.gz
index f0625580c..4fb82efce 100644
Binary files a/install/ubuntu/12.04/firewall.tar.gz and b/install/ubuntu/12.04/firewall.tar.gz differ
diff --git a/install/ubuntu/12.04/packages.tar.gz b/install/ubuntu/12.04/packages.tar.gz
index 15e18e836..d5c13c468 100644
Binary files a/install/ubuntu/12.04/packages.tar.gz and b/install/ubuntu/12.04/packages.tar.gz differ
diff --git a/install/ubuntu/12.04/templates.tar.gz b/install/ubuntu/12.04/templates.tar.gz
index bdeab7f5b..44073e768 100644
Binary files a/install/ubuntu/12.04/templates.tar.gz and b/install/ubuntu/12.04/templates.tar.gz differ
diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl
index 3f71e6999..96de57af7 100755
--- a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl
@@ -35,7 +35,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 75daf0e10..07ec38c98 100755
--- a/install/ubuntu/12.04/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/basedir.tpl
@@ -29,7 +29,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 e884a95b9..da523c138 100755
--- a/install/ubuntu/12.04/templates/web/apache2/default.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/default.stpl
@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 073724ce0..b95c1ee38 100755
--- a/install/ubuntu/12.04/templates/web/apache2/default.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/default.tpl
@@ -28,7 +28,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 7a5d7787f..c1c91e22e 100755
--- 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>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 ab844dc74..8f3ec012a 100755
--- 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>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 aa5137308..58c4baf90 100755
--- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl
@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 a05ff252d..21be2cdd7 100755
--- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.tpl
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 622495756..20a580093 100755
--- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl
@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 5c1f16e20..72e7d8d44 100755
--- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.tpl
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/12.10/dovecot.tar.gz b/install/ubuntu/12.10/dovecot.tar.gz
index 40d9292b2..381067f70 100644
Binary files a/install/ubuntu/12.10/dovecot.tar.gz and b/install/ubuntu/12.10/dovecot.tar.gz differ
diff --git a/install/ubuntu/12.10/fail2ban.tar.gz b/install/ubuntu/12.10/fail2ban.tar.gz
index 9ea57f770..9067be54e 100644
Binary files a/install/ubuntu/12.10/fail2ban.tar.gz and b/install/ubuntu/12.10/fail2ban.tar.gz differ
diff --git a/install/ubuntu/12.10/firewall.tar.gz b/install/ubuntu/12.10/firewall.tar.gz
index dce4fe075..4fb82efce 100644
Binary files a/install/ubuntu/12.10/firewall.tar.gz and b/install/ubuntu/12.10/firewall.tar.gz differ
diff --git a/install/ubuntu/12.10/packages.tar.gz b/install/ubuntu/12.10/packages.tar.gz
index d17f37f21..e6c3a0671 100644
Binary files a/install/ubuntu/12.10/packages.tar.gz and b/install/ubuntu/12.10/packages.tar.gz differ
diff --git a/install/ubuntu/12.10/templates.tar.gz b/install/ubuntu/12.10/templates.tar.gz
index dfd35e917..171b0f4ab 100644
Binary files a/install/ubuntu/12.10/templates.tar.gz and b/install/ubuntu/12.10/templates.tar.gz differ
diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl
index 3f71e6999..96de57af7 100755
--- a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl
@@ -35,7 +35,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 75daf0e10..07ec38c98 100755
--- a/install/ubuntu/12.10/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/basedir.tpl
@@ -29,7 +29,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 e884a95b9..da523c138 100755
--- a/install/ubuntu/12.10/templates/web/apache2/default.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/default.stpl
@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 073724ce0..b95c1ee38 100755
--- a/install/ubuntu/12.10/templates/web/apache2/default.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/default.tpl
@@ -28,7 +28,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 7a5d7787f..c1c91e22e 100755
--- 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>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 ab844dc74..8f3ec012a 100755
--- 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>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 aa5137308..58c4baf90 100755
--- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl
@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 a05ff252d..21be2cdd7 100755
--- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.tpl
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 622495756..20a580093 100755
--- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl
@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 5c1f16e20..72e7d8d44 100755
--- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.tpl
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.04/dovecot.tar.gz b/install/ubuntu/13.04/dovecot.tar.gz
index da7a32e6f..09914f981 100644
Binary files a/install/ubuntu/13.04/dovecot.tar.gz and b/install/ubuntu/13.04/dovecot.tar.gz differ
diff --git a/install/ubuntu/13.04/fail2ban.tar.gz b/install/ubuntu/13.04/fail2ban.tar.gz
index 824f87948..93832ed88 100644
Binary files a/install/ubuntu/13.04/fail2ban.tar.gz and b/install/ubuntu/13.04/fail2ban.tar.gz differ
diff --git a/install/ubuntu/13.04/firewall.tar.gz b/install/ubuntu/13.04/firewall.tar.gz
index dce4fe075..5f2614a9f 100644
Binary files a/install/ubuntu/13.04/firewall.tar.gz and b/install/ubuntu/13.04/firewall.tar.gz differ
diff --git a/install/ubuntu/13.04/packages.tar.gz b/install/ubuntu/13.04/packages.tar.gz
index d17f37f21..e6c3a0671 100644
Binary files a/install/ubuntu/13.04/packages.tar.gz and b/install/ubuntu/13.04/packages.tar.gz differ
diff --git a/install/ubuntu/13.04/templates.tar.gz b/install/ubuntu/13.04/templates.tar.gz
index 5f61577ba..c2ee87db6 100644
Binary files a/install/ubuntu/13.04/templates.tar.gz and b/install/ubuntu/13.04/templates.tar.gz differ
diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl
index 3f71e6999..96de57af7 100755
--- a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl
@@ -35,7 +35,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 75daf0e10..07ec38c98 100755
--- a/install/ubuntu/13.04/templates/web/apache2/basedir.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/basedir.tpl
@@ -29,7 +29,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 e884a95b9..da523c138 100755
--- a/install/ubuntu/13.04/templates/web/apache2/default.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/default.stpl
@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 073724ce0..b95c1ee38 100755
--- a/install/ubuntu/13.04/templates/web/apache2/default.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/default.tpl
@@ -28,7 +28,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 7a5d7787f..c1c91e22e 100755
--- a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 ab844dc74..8f3ec012a 100755
--- a/install/ubuntu/13.04/templates/web/apache2/hosting.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/hosting.tpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 aa5137308..58c4baf90 100755
--- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl
@@ -29,7 +29,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 a05ff252d..21be2cdd7 100755
--- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.tpl
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.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 622495756..20a580093 100755
--- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl
@@ -30,7 +30,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.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 5c1f16e20..72e7d8d44 100755
--- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl
+++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.tpl
@@ -22,7 +22,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
 
 </VirtualHost>
 
diff --git a/install/ubuntu/13.10/dovecot.tar.gz b/install/ubuntu/13.10/dovecot.tar.gz
index da7a32e6f..09914f981 100644
Binary files a/install/ubuntu/13.10/dovecot.tar.gz and b/install/ubuntu/13.10/dovecot.tar.gz differ
diff --git a/install/ubuntu/13.10/fail2ban.tar.gz b/install/ubuntu/13.10/fail2ban.tar.gz
index 824f87948..93832ed88 100644
Binary files a/install/ubuntu/13.10/fail2ban.tar.gz and b/install/ubuntu/13.10/fail2ban.tar.gz differ
diff --git a/install/ubuntu/13.10/firewall.tar.gz b/install/ubuntu/13.10/firewall.tar.gz
index dce4fe075..5f2614a9f 100644
Binary files a/install/ubuntu/13.10/firewall.tar.gz and b/install/ubuntu/13.10/firewall.tar.gz differ
diff --git a/install/ubuntu/13.10/packages.tar.gz b/install/ubuntu/13.10/packages.tar.gz
index d17f37f21..e6c3a0671 100644
Binary files a/install/ubuntu/13.10/packages.tar.gz and b/install/ubuntu/13.10/packages.tar.gz differ
diff --git a/install/ubuntu/13.10/templates.tar.gz b/install/ubuntu/13.10/templates.tar.gz
index 82f493f2f..9d61eafe0 100644
Binary files a/install/ubuntu/13.10/templates.tar.gz and b/install/ubuntu/13.10/templates.tar.gz differ
diff --git a/install/ubuntu/14.04/dovecot.tar.gz b/install/ubuntu/14.04/dovecot.tar.gz
index e6a75fced..83d540fcd 100644
Binary files a/install/ubuntu/14.04/dovecot.tar.gz and b/install/ubuntu/14.04/dovecot.tar.gz differ
diff --git a/install/ubuntu/14.04/fail2ban.tar.gz b/install/ubuntu/14.04/fail2ban.tar.gz
index 5d0c7c980..9618e3881 100644
Binary files a/install/ubuntu/14.04/fail2ban.tar.gz and b/install/ubuntu/14.04/fail2ban.tar.gz differ
diff --git a/install/ubuntu/14.04/firewall.tar.gz b/install/ubuntu/14.04/firewall.tar.gz
index 3eeeb373d..5011ce37d 100644
Binary files a/install/ubuntu/14.04/firewall.tar.gz and b/install/ubuntu/14.04/firewall.tar.gz differ
diff --git a/install/ubuntu/14.04/packages.tar.gz b/install/ubuntu/14.04/packages.tar.gz
index 8bdafde82..4838e33cc 100644
Binary files a/install/ubuntu/14.04/packages.tar.gz and b/install/ubuntu/14.04/packages.tar.gz differ
diff --git a/install/ubuntu/14.04/templates.tar.gz b/install/ubuntu/14.04/templates.tar.gz
index 1308e254c..e405fd768 100644
Binary files a/install/ubuntu/14.04/templates.tar.gz and b/install/ubuntu/14.04/templates.tar.gz differ
diff --git a/install/ubuntu/14.10/dovecot.tar.gz b/install/ubuntu/14.10/dovecot.tar.gz
index e6a75fced..83d540fcd 100644
Binary files a/install/ubuntu/14.10/dovecot.tar.gz and b/install/ubuntu/14.10/dovecot.tar.gz differ
diff --git a/install/ubuntu/14.10/fail2ban.tar.gz b/install/ubuntu/14.10/fail2ban.tar.gz
index 5d0c7c980..9618e3881 100644
Binary files a/install/ubuntu/14.10/fail2ban.tar.gz and b/install/ubuntu/14.10/fail2ban.tar.gz differ
diff --git a/install/ubuntu/14.10/firewall.tar.gz b/install/ubuntu/14.10/firewall.tar.gz
index 3eeeb373d..5011ce37d 100644
Binary files a/install/ubuntu/14.10/firewall.tar.gz and b/install/ubuntu/14.10/firewall.tar.gz differ
diff --git a/install/ubuntu/14.10/packages.tar.gz b/install/ubuntu/14.10/packages.tar.gz
index 8bdafde82..4838e33cc 100644
Binary files a/install/ubuntu/14.10/packages.tar.gz and b/install/ubuntu/14.10/packages.tar.gz differ
diff --git a/install/ubuntu/14.10/templates.tar.gz b/install/ubuntu/14.10/templates.tar.gz
index 9fd8fccbc..f5b9cb13b 100644
Binary files a/install/ubuntu/14.10/templates.tar.gz and b/install/ubuntu/14.10/templates.tar.gz differ
diff --git a/install/ubuntu/15.04/dovecot.tar.gz b/install/ubuntu/15.04/dovecot.tar.gz
index e6a75fced..83d540fcd 100644
Binary files a/install/ubuntu/15.04/dovecot.tar.gz and b/install/ubuntu/15.04/dovecot.tar.gz differ
diff --git a/install/ubuntu/15.04/fail2ban.tar.gz b/install/ubuntu/15.04/fail2ban.tar.gz
index 5d0c7c980..9618e3881 100644
Binary files a/install/ubuntu/15.04/fail2ban.tar.gz and b/install/ubuntu/15.04/fail2ban.tar.gz differ
diff --git a/install/ubuntu/15.04/firewall.tar.gz b/install/ubuntu/15.04/firewall.tar.gz
index 3eeeb373d..5011ce37d 100644
Binary files a/install/ubuntu/15.04/firewall.tar.gz and b/install/ubuntu/15.04/firewall.tar.gz differ
diff --git a/install/ubuntu/15.04/packages.tar.gz b/install/ubuntu/15.04/packages.tar.gz
index 8bdafde82..4838e33cc 100644
Binary files a/install/ubuntu/15.04/packages.tar.gz and b/install/ubuntu/15.04/packages.tar.gz differ
diff --git a/install/ubuntu/15.04/templates.tar.gz b/install/ubuntu/15.04/templates.tar.gz
index 0a457066c..d96e3cf2b 100644
Binary files a/install/ubuntu/15.04/templates.tar.gz and b/install/ubuntu/15.04/templates.tar.gz differ
diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index f867a654a..7dc3a3b7c 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -1074,12 +1074,12 @@ if [ "$fail2ban" = 'yes' ]; then
     rm -f fail2ban.tar.gz
     if [ "$dovecot" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     if [ "$exim" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     update-rc.d fail2ban defaults
diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index 058af598d..818baf56c 100755
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -1143,12 +1143,12 @@ if [ "$fail2ban" = 'yes' ]; then
     rm -f fail2ban.tar.gz
     if [ "$dovecot" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     if [ "$exim" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     chkconfig fail2ban on
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 64306f8a5..194196d66 100755
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -1063,12 +1063,12 @@ if [ "$fail2ban" = 'yes' ]; then
     rm -f fail2ban.tar.gz
     if [ "$dovecot" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     if [ "$exim" = 'no' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2)
-        fline=$(echo "$fline" |tail -n1 |cut -f 1 -d -)
+        fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local
     fi
     update-rc.d fail2ban defaults