diff --git a/actions/admin/settings/120.system.php b/actions/admin/settings/120.system.php
index b2316307..8009fb48 100644
--- a/actions/admin/settings/120.system.php
+++ b/actions/admin/settings/120.system.php
@@ -29,6 +29,7 @@ return array(
 					'type' => 'string',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkPathConflicts'
 					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
@@ -58,6 +59,22 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingHostname',
 					),
+				'system_froxlordirectlyviahostname' => array(
+					'label' => $lng['serversettings']['froxlordirectlyviahostname'],
+					'settinggroup' => 'system',
+					'varname' => 'froxlordirectlyviahostname',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'system_stdsubdomain' => array(
+					'label' => $lng['serversettings']['stdsubdomainhost'],
+					'settinggroup' => 'system',
+					'varname' => 'stdsubdomain',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingHostname',
+					),
 				'system_mysql_access_host' => array(
 					'label' => $lng['serversettings']['mysql_access_host'],
 					'settinggroup' => 'system',
diff --git a/lib/classes/phpinterface/class.phpinterface_fcgid.php b/lib/classes/phpinterface/class.phpinterface_fcgid.php
index 98094623..3db18d15 100644
--- a/lib/classes/phpinterface/class.phpinterface_fcgid.php
+++ b/lib/classes/phpinterface/class.phpinterface_fcgid.php
@@ -215,7 +215,7 @@ class phpinterface_fcgid
 	{
 		$configdir = makeCorrectDir($this->_settings['system']['mod_fcgid_configdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/');
 
-		if(!is_dir($configdir))
+		if(!is_dir($configdir) && $createifnotexists)
 		{
 			safe_exec('mkdir -p ' . escapeshellarg($configdir));
 			safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($configdir));
@@ -235,7 +235,7 @@ class phpinterface_fcgid
 	{
 		$tmpdir = makeCorrectDir($this->_settings['system']['mod_fcgid_tmpdir'] . '/' . $this->_domain['loginname'] . '/');
 
-		if(!is_dir($tmpdir))
+		if(!is_dir($tmpdir) && $createifnotexists)
 		{
 			safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
 			safe_exec('chown -R ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($tmpdir));
diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php
index e850495f..5b57b4f5 100644
--- a/lib/classes/phpinterface/class.phpinterface_fpm.php
+++ b/lib/classes/phpinterface/class.phpinterface_fpm.php
@@ -139,7 +139,7 @@ class phpinterface_fpm
 		$configdir = makeCorrectDir($this->_settings['phpfpm']['configdir']);
 		$config = makeCorrectFile($configdir.'/'.$this->_domain['domain'].'.conf');
 
-		if(!is_dir($configdir))
+		if(!is_dir($configdir) && $createifnotexists)
 		{
 			safe_exec('mkdir -p ' . escapeshellarg($configdir));
 		}
@@ -150,14 +150,16 @@ class phpinterface_fpm
 	/**
 	 * return path of fpm-socket file
 	 * 
+	 * @param boolean $createifnotexists create the directory if it does not exist
+	 * 
 	 * @return string the full path to the socket
 	 */
-	public function getSocketFile()
+	public function getSocketFile($createifnotexists = true)
 	{
 		$socketdir = makeCorrectDir('/var/run/'.$this->_settings['system']['webserver'].'/');
 		$socket = makeCorrectFile($socketdir.'/'.$this->_domain['loginname'].'-'.$this->_domain['domain'].'-php-fpm.socket');
 
-		if(!is_dir($socketdir))
+		if(!is_dir($socketdir) && $createifnotexists)
 		{
 			safe_exec('mkdir -p '.$socketdir);
 			safe_exec('chown -R '.$this->_settings['system']['httpuser'].':'.$this->_settings['system']['httpgroup'].' '.$socketdir);