diff --git a/lib/configfiles/freebsd.inc.php b/lib/configfiles/freebsd.inc.php
index c936dc68..b82bd43c 100644
--- a/lib/configfiles/freebsd.inc.php
+++ b/lib/configfiles/freebsd.inc.php
@@ -39,8 +39,6 @@ return array(
 			'http' => array(
 				'label' => $lng['admin']['configfiles']['http'],
 				'daemons' => array(
-
-					// Begin: Nginx Config
 					'nginx' => array(
 						'label' => 'Nginx Webserver',
 						'commands_1' => array(
@@ -58,7 +56,7 @@ return array(
 						'commands_2' => array(
 							$configcommand['vhost'],
 							$configcommand['diroptions'],
-							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p '. Settings::Get('system.deactivateddocroot') : null,
+							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
 							'mkdir -p '. Settings::Get('system.documentroot_prefix'),
 							'mkdir -p '. Settings::Get('system.mod_fcgid_tmpdir'),
 							'mkdir -p '. Settings::Get('system.logfiles_directory'),
@@ -71,8 +69,6 @@ return array(
 							'/usr/local/etc/rc.d/nginx restart'
 						)
 					),
-					// End: Nginx Config
-
 					'apache2' => array(
 						'label' => 'Apache2 Webserver',
 						'commands' => array(
diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php
index b1224c4f..898939c4 100644
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -101,7 +101,7 @@ return array(
 						'commands_2' => array(
 							'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
 							'mkdir -p ' . Settings::Get('system.logfiles_directory'),
-							'mkdir -p ' . Settings::Get('system.deactivateddocroot'),
+							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
 							'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod u+x /etc/init.d/php-fcgi',
diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php
index 71170863..c257672b 100644
--- a/lib/configfiles/lucid.inc.php
+++ b/lib/configfiles/lucid.inc.php
@@ -99,7 +99,7 @@ return array(
 							'rm /etc/nginx/sites-enabled/default',
 							'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
 							'mkdir -p ' . Settings::Get('system.logfiles_directory'),
-							'mkdir -p ' . Settings::Get('system.deactivateddocroot'),
+							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
 							'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod u+x /etc/init.d/php-fcgi'
diff --git a/lib/configfiles/precise.inc.php b/lib/configfiles/precise.inc.php
index 0387eeb9..d537699f 100644
--- a/lib/configfiles/precise.inc.php
+++ b/lib/configfiles/precise.inc.php
@@ -99,7 +99,7 @@ return array(
 							'rm /etc/nginx/sites-enabled/default',
 							'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
 							'mkdir -p ' . Settings::Get('system.logfiles_directory'),
-							'mkdir -p ' . Settings::Get('system.deactivateddocroot'),
+							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
 							'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod u+x /etc/init.d/php-fcgi'
diff --git a/lib/configfiles/squeeze.inc.php b/lib/configfiles/squeeze.inc.php
index 512ab70f..0c0d2847 100644
--- a/lib/configfiles/squeeze.inc.php
+++ b/lib/configfiles/squeeze.inc.php
@@ -99,7 +99,7 @@ return array(
 							'rm /etc/nginx/sites-enabled/default',
 							'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
 							'mkdir -p ' . Settings::Get('system.logfiles_directory'),
-							//'mkdir -p ' . Settings::Get('system.deactivateddocroot'),
+							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
 							'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod u+x /etc/init.d/php-fcgi'
diff --git a/lib/configfiles/wheezy.inc.php b/lib/configfiles/wheezy.inc.php
index 65a83e39..f7aa6369 100644
--- a/lib/configfiles/wheezy.inc.php
+++ b/lib/configfiles/wheezy.inc.php
@@ -97,7 +97,7 @@ return array(
 							'rm /etc/nginx/sites-enabled/default',
 							'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
 							'mkdir -p ' . Settings::Get('system.logfiles_directory'),
-							//'mkdir -p ' . Settings::Get('system.deactivateddocroot'),
+							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
 							'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
 							'chmod u+x /etc/init.d/php-fcgi'