diff --git a/admin_updates.php b/admin_updates.php
index 38ab2459..a7398b08 100644
--- a/admin_updates.php
+++ b/admin_updates.php
@@ -67,16 +67,16 @@ if ($page == 'overview') {
 				|| !isset($_POST['update_preconfig'])
 			) {
 				eval("echo \"" . getTemplate('update/update_start') . "\";");
-	
+
 				include_once './install/updatesql.php';
-	
+
 				$redirect_url = 'admin_index.php?s=' . $s;
 				eval("echo \"" . getTemplate('update/update_end') . "\";");
-	
+
 				updateCounters();
 				inserttask('1');
 				@chmod('./lib/userdata.inc.php', 0440);
-				
+
 				$successful_update = true;
 			} else {
 				$message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>';
@@ -85,7 +85,7 @@ if ($page == 'overview') {
 
 		if (!$successful_update) {
 			$current_version = Settings::Get('panel.version');
-			$current_db_version = Settings::Get('panel.dbversion');
+			$current_db_version = Settings::Get('panel.db_version');
 			if (empty($current_db_version)) {
 			    $current_db_version = "0";
 			}
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 47855444..fbe05f7c 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3145,7 +3145,7 @@ if (isFroxlorVersion('0.9.35-dev7')) {
     updateToVersion('0.9.35-rc1');
 }
 
-if (isFroxlorVersion('0.9.35-rc1')) {
+if (isFroxlorVersion('0.9.35-rc1') && isDatabaseVersion('0')) {
 
     Settings::AddNew("panel.db_version", "201603070");