diff --git a/.gitignore b/.gitignore
index 980bc5b3..d6ed513f 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 91a55bc0..64d371a5 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 a2bf42b7..79690627 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 a98e2001..b0f3f81c 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 c692568f..5c834ca6 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 3da0cec2..0dd30d9d 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 91a55bc0..64d371a5 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 a2bf42b7..79690627 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 a98e2001..b0f3f81c 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 c692568f..5c834ca6 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 0f1c99e8..e10686f2 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 c17fafea..4b36a9b9 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 42dbaba5..833b186d 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 dcef27e6..1e5578bb 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 da37c520..956ebd36 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 a7c145d9..05dbb391 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 3ce714be..f3b19a59 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 42dbaba5..833b186d 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 dcef27e6..1e5578bb 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 da37c520..956ebd36 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 d1133a1f..4aabc113 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 da256097..0b73120f 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 42dbaba5..833b186d 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 dcef27e6..1e5578bb 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 da37c520..956ebd36 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 b569f848..90a5b668 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 40d9292b..381067f7 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 9ea57f77..9067be54 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 f0625580..4fb82efc 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 15e18e83..d5c13c46 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 bdeab7f5..44073e76 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 3f71e699..96de57af 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 75daf0e1..07ec38c9 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 e884a95b..da523c13 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 073724ce..b95c1ee3 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 7a5d7787..c1c91e22 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 ab844dc7..8f3ec012 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 aa513730..58c4baf9 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 a05ff252..21be2cdd 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 62249575..20a58009 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 5c1f16e2..72e7d8d4 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 40d9292b..381067f7 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 9ea57f77..9067be54 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 dce4fe07..4fb82efc 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 d17f37f2..e6c3a067 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 dfd35e91..171b0f4a 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 3f71e699..96de57af 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 75daf0e1..07ec38c9 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 e884a95b..da523c13 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 073724ce..b95c1ee3 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 7a5d7787..c1c91e22 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 ab844dc7..8f3ec012 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 aa513730..58c4baf9 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 a05ff252..21be2cdd 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 62249575..20a58009 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 5c1f16e2..72e7d8d4 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 da7a32e6..09914f98 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 824f8794..93832ed8 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 dce4fe07..5f2614a9 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 d17f37f2..e6c3a067 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 5f61577b..c2ee87db 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 3f71e699..96de57af 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 75daf0e1..07ec38c9 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 e884a95b..da523c13 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 073724ce..b95c1ee3 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 7a5d7787..c1c91e22 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 ab844dc7..8f3ec012 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 aa513730..58c4baf9 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 a05ff252..21be2cdd 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 62249575..20a58009 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 5c1f16e2..72e7d8d4 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 da7a32e6..09914f98 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 824f8794..93832ed8 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 dce4fe07..5f2614a9 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 d17f37f2..e6c3a067 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 82f493f2..9d61eafe 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 e6a75fce..83d540fc 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 5d0c7c98..9618e388 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 3eeeb373..5011ce37 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 8bdafde8..4838e33c 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 1308e254..e405fd76 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 e6a75fce..83d540fc 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 5d0c7c98..9618e388 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 3eeeb373..5011ce37 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 8bdafde8..4838e33c 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 9fd8fccb..f5b9cb13 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 e6a75fce..83d540fc 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 5d0c7c98..9618e388 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 3eeeb373..5011ce37 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 8bdafde8..4838e33c 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 0a457066..d96e3cf2 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 f867a654..7dc3a3b7 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 058af598..818baf56 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 64306f8a..194196d6 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