diff --git a/install/index.php b/install/index.php
index 54dc7145..bd3e3bed 100644
--- a/install/index.php
+++ b/install/index.php
@@ -64,12 +64,16 @@ $errors = array();
 
 if($step == 'database') {
 	foreach($_SESSION as $key => $value) {
-		if(strpos($key, 'var_') === false || strpos($key, 'account') !== false || strpos($key, 'password') !== false) {
+		if(strpos($key, 'var_') === false) {
 			continue;
 		}
 
 		$key = str_replace('var_', '', $key);
 
+		if(in_array($key, array('account', 'password', 'email', 'player_name'))) {
+			continue;
+		}
+
 		if($key != 'usage' && empty($value)) {
 			$errors[] = $locale['please_fill_all'];
 			break;