diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 78b57d8603164236c34c74c9b07a4c2132819f02..0d6f14ebfc9fc22c6344c0e36c0c91e1a78cb286 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -16,18 +16,18 @@
 <tmpl_if name='alias'>
     ServerAlias <tmpl_var name='alias'>
 </tmpl_if>
-<tmpl_if name='cgi'>
+<tmpl_if name='cgi' op='==' value='y'>
     # cgi enabled
     ScriptAlias  /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
     AddHandler cgi-script .cgi
     AddHandler cgi-script .pl
 </tmpl_if>
-<tmpl_if name='ssi'>
+<tmpl_if name='ssi' op='==' value='y'>
     # ssi enabled
     AddType text/html .shtml
     AddOutputFilter INCLUDES .shtml
 </tmpl_if>
-<tmpl_if name='suexec'>
+<tmpl_if name='suexec' op='==' value='y'>
     # suexec enabled
     SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
 </tmpl_if>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5fb364862ca4a06ee8f025e23c67987fa2b8194c..c0b04a4856783b03c531dba3515b8fdb32084543 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -447,6 +447,11 @@ class apache2_plugin {
 		}
 		// end removing symlinks
 		
+		// Delete the log file directory
+		$vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);
+		if($data["old"]["domain"] != '' && !stristr($vhost_logfile_dir,'..')) exec("rm -rf $vhost_logfile_dir");
+		$app->log("Removing website logfile directory: $vhost_logfile_dir",LOGLEVEL_DEBUG);
+		
 	}
 	
 	//* This function is called when a IP on the server is inserted, updated or deleted