diff --git a/install/froxlor.sql b/install/froxlor.sql
index 0db4e29c..e7e90cc6 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.10-svn2');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.10-svn1');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 89b04294..5da77efc 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -802,22 +802,25 @@ if(isFroxlorVersion('0.9.9'))
 	showUpdateStep("Checking whether you are missing any settings", false);
 	$nonefound = true;
 	
-	$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
-	if(!isset($result) || !isset($result['value']))
+	$update_httpuser = isset($_POST['update_httpuser']) ? $_POST['update_httpuser'] : false;
+	$update_httpgroup = isset($_POST['update_httpgroup']) ? $_POST['update_httpgroup'] : false;
+
+	if($update_httpuser !== false)
 	{
 		$nonefound = false;
 		showUpdateStep("Adding missing setting 'httpuser'");
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpuser', 'www-data');");
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpuser', '".$update_httpuser."');");
 		lastStepStatus(0);
 	}
-	$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
-	if(!isset($result) || !isset($result['value']))
+
+	if($update_httpgroup !== false)
 	{
 		$nonefound = false;
 		showUpdateStep("Adding missing setting 'httpgroup'");
-		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpgroup', 'www-data');");
+		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpgroup', '".$update_httpgroup."');");
 		lastStepStatus(0);
 	}
+
 	$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'debug_cron'");
 	if(!isset($result) || !isset($result['value']))
 	{
@@ -834,27 +837,3 @@ if(isFroxlorVersion('0.9.9'))
 
 	updateToVersion('0.9.10-svn1');
 }
-
-if(isFroxlorVersion('0.9.10-svn1'))
-{
-	showUpdateStep("Updating from 0.9.10-svn1 to 0.9.10-svn2", false);
-
-	$update_httpuser = isset($_POST['update_httpuser']) ? $_POST['update_httpuser'] : false;
-	$update_httpgroup = isset($_POST['update_httpgroup']) ? $_POST['update_httpgroup'] : false;
-
-	if($update_httpuser !== false)
-	{
-		showUpdateStep("Setting httpuser to '".$update_httpuser."'");
-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='".$update_httpuser."' WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
-		lastStepStatus(0);
-	}
-	
-	if($update_httpgroup !== false)
-	{
-		showUpdateStep("Setting httpgroup to '".$update_httpgroup."'");
-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='".$update_httpgroup."' WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
-		lastStepStatus(0);
-	}
-
-	updateToVersion('0.9.10-svn2');
-}
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
index 21b6598f..64ace6c0 100644
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -159,30 +159,53 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
 	
-	if(versionInUpdate($current_version, '0.9.10-svn2'))
+	if(versionInUpdate($current_version, '0.9.10-svn1'))
 	{
-		$has_preconfig = true;
-		
-		$guessed_user = 'www-data';
-		$guessed_group = 'www-data';
+		$has_nouser = false;
+		$has_nogroup = false;
 
-		if(function_exists('posix_getuid')
-			&& function_exists('posix_getpwuid')
-		) {
-			$_httpuser = posix_getpwuid(posix_getuid());
-			$guessed_user = $_httpuser['name'];
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
+		if(!isset($result) || !isset($result['value']))
+		{
+			$has_preconfig = true;
+			$has_nouser = true;
+			$guessed_user = 'www-data';
+			if(function_exists('posix_getuid')
+				&& function_exists('posix_getpwuid')
+			) {
+				$_httpuser = posix_getpwuid(posix_getuid());
+				$guessed_user = $_httpuser['name'];
+			}
 		}
 		
-		if(function_exists('posix_getgid')
-			&& function_exists('posix_getgrgid')
-		) {
-			$_httpgroup = posix_getgrgid(posix_getgid());
-			$guessed_group = $_httpgroup['name'];
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
+		if(!isset($result) || !isset($result['value']))
+		{
+			$has_preconfig = true;
+			$has_nogroup = true;
+			$guessed_group = 'www-data';
+			if(function_exists('posix_getgid')
+				&& function_exists('posix_getgrgid')
+			) {
+				$_httpgroup = posix_getgrgid(posix_getgid());
+				$guessed_group = $_httpgroup['name'];
+			}
 		}
 
 		$description = 'Please enter the correct username/groupname of the webserver on your system We\'re guessing the user but it might not be correct, so please check.';
-		$question = '<strong>Please enter the webservers username:</strong>&nbsp;<input type="text" class="text" name="update_httpuser" value="'.$guessed_user.'" /><br /><br />';
-		$question .= '<strong>Please enter the webservers groupname:</strong>&nbsp;<input type="text" class="text" name="update_httpgroup" value="'.$guessed_group.'" />';
+		if($has_nouser)
+		{
+			$question = '<strong>Please enter the webservers username:</strong>&nbsp;<input type="text" class="text" name="update_httpuser" value="'.$guessed_user.'" />';
+		} 
+		elseif($has_nogroup) 
+		{
+			$question2 = '<strong>Please enter the webservers groupname:</strong>&nbsp;<input type="text" class="text" name="update_httpgroup" value="'.$guessed_group.'" />';
+			if($has_nouser) {
+				$question .= '<br /><br />'.$question2;
+			} else {
+				$question = $question2;
+			}
+		}
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
 }
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index 7b5b732f..140d0bfd 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.10-svn2';
+$version = '0.9.10-svn1';
 $dbversion = '2';
 $branding = '';