diff --git a/scripts/client/scoreboard.js b/scripts/client/scoreboard.js
index 8c254995..92ac1748 100644
--- a/scripts/client/scoreboard.js
+++ b/scripts/client/scoreboard.js
@@ -17,10 +17,10 @@ let scoreboardKey = SDLK_TAB;
 // ===========================================================================
 
 function initScoreBoardScript() {
-	logToConsole(LOG_DEBUG, "[AGRP.ScoreBoard]: Initializing scoreboard script ...");
+	logToConsole(LOG_DEBUG, "[V.RP.ScoreBoard]: Initializing scoreboard script ...");
 	scoreBoardTitleFont = initScoreBoardTitleFont();
 	scoreBoardListFont = initScoreBoardListFont();
-	logToConsole(LOG_DEBUG, "[AGRP.ScoreBoard]: Scoreboard script initialized!");
+	logToConsole(LOG_DEBUG, "[V.RP.ScoreBoard]: Scoreboard script initialized!");
 }
 
 // ===========================================================================
diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index 5924f23f..b552ef5e 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -686,7 +686,7 @@ function createDefaultSubAccountServerData(databaseId) {
 	let serversAssoc = fetchQueryAssoc(dbConnection, "SELECT * FROM svr_main");
 
 	for (let i in serversAssoc) {
-		let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server, sacct_svr_skin) VALUES (${databaseId}, ${i}, ${serversAssoc[i]["svr_newchar_skin"]})`;
+		let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server, sacct_svr_skin) VALUES (${databaseId}, ${serversAssoc[i]["svr_id"]}, ${serversAssoc[i]["svr_newchar_skin"]})`;
 		quickDatabaseQuery(dbQueryString);
 	}
 }
diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index 87595454..81cc79d0 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -1453,7 +1453,10 @@ function stopRentingVehicle(client) {
 	let vehicle = getPlayerData(client).rentingVehicle;
 	getPlayerData(client).rentingVehicle = false;
 	getVehicleData(vehicle).rentedBy = false;
-	respawnVehicle(vehicle);
+	removeAllOccupantsFromVehicle(vehicle);
+	setTimeout(function () {
+		respawnVehicle(vehicle);
+	}, 1000);
 }
 
 // ===========================================================================