diff --git a/install/steps/7-finish.php b/install/steps/7-finish.php
index a2f083dc01..350c02f4ef 100644
--- a/install/steps/7-finish.php
+++ b/install/steps/7-finish.php
@@ -137,14 +137,5 @@
 			}
 			$_SESSION['installed'] = true;
 		}
-
-		foreach($_SESSION as $key => $value) {
-			if(strpos($key, 'var_') !== false)
-				unset($_SESSION[$key]);
-		}
-		unset($_SESSION['saved']);
-		if(file_exists(CACHE . 'install.txt')) {
-			unlink(CACHE . 'install.txt');
-		}
 	}
 }
diff --git a/install/tools/7-finish.php b/install/tools/7-finish.php
index 05fe2107b0..317388b5f4 100644
--- a/install/tools/7-finish.php
+++ b/install/tools/7-finish.php
@@ -97,8 +97,18 @@ function insert_sample_if_not_exist($p) {
 require_once SYSTEM . 'migrations/27.php';
 require_once SYSTEM . 'migrations/30.php';
 
+foreach($_SESSION as $key => $value) {
+	if(str_contains($key, 'var_'))
+		unset($_SESSION[$key]);
+}
+
+unset($_SESSION['saved']);
+if(file_exists(CACHE . 'install.txt')) {
+	unlink(CACHE . 'install.txt');
+}
+
 $locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']);
 $locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']);
 $locale['step_finish_desc'] = str_replace('$LINK$', generateLink('https://my-aac.org', 'https://my-aac.org', true), $locale['step_finish_desc']);
 
-success($locale['step_finish_desc']);
\ No newline at end of file
+success($locale['step_finish_desc']);