diff --git a/install/assets/install.sql b/install/assets/install.sql
index 413102620..c494e2323 100755
--- a/install/assets/install.sql
+++ b/install/assets/install.sql
@@ -437,7 +437,7 @@ CREATE TABLE `users` (
 -- ----------------------------
 -- Records of users
 -- ----------------------------
-INSERT INTO `users` VALUES ('4', '4w7est', '$2y$10$WFGFdNK.I4X0z1qXxjqrEeMvy65M2OyxJiNcNCY0gQ4KzeCCKms02', 'demo@demo.com', '99', '4W7EST', 'HH44aa', 'Demo', 'Account', '0', null, null, null, null, null);
+INSERT INTO `users` VALUES ('4', '%%FIRSTUSER_NAME%%', '%%FIRSTUSER_PASS%%', '%%FIRSTUSER_MAIL%%', '99', '%%FIRSTUSER_CALL%%', '%%FIRSTUSER_LOCATOR%%', '%%FIRSTUSER_FIRSTNAME%%', '%%FIRSTUSER_LASTNAME%%', '%%FIRSTUSER_TIMEZONE%%', null, null, null, null, null);
 
 
 
diff --git a/install/includes/database_class.php b/install/includes/database_class.php
index 0e2aeb2b3..94e2b28dc 100644
--- a/install/includes/database_class.php
+++ b/install/includes/database_class.php
@@ -34,10 +34,21 @@ class Database {
 		// Open the default SQL file
 		$query = file_get_contents('assets/install.sql');
 
+		$newpw=password_hash($data['password'], PASSWORD_DEFAULT);
+		$newquery  = str_replace("%%FIRSTUSER_NAME%%",$data['username'],$query);
+		$newquery  = str_replace("%%FIRSTUSER_PASS%%",$newpw,$newquery);
+		$newquery  = str_replace("%%FIRSTUSER_MAIL%%",$data['user_email'],$newquery);
+		$newquery  = str_replace("%%FIRSTUSER_CALL%%",$data['callsign'],$newquery);
+		$newquery  = str_replace("%%FIRSTUSER_LOCATOR%%",$data['userlocator'],$newquery);
+		$newquery  = str_replace("%%FIRSTUSER_FIRSTNAME%%",$data['firstname'],$newquery);
+		$newquery  = str_replace("%%FIRSTUSER_LASTNAME%%",$data['lastname'],$newquery);
+		$newquery  = str_replace("%%FIRSTUSER_TIMEZONE%%",$data['timezone'],$newquery);
+
+
 		mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
 
 		// Execute a multi query
-		$mysqli->multi_query($query);
+		$mysqli->multi_query($newquery);
 
 		// MultiQuery is NON-Blocking,so wait until everything is done
 		do { null; } while($mysqli->next_result());