diff --git a/scripts/server/account.js b/scripts/server/account.js
index 01a57bf0..ebead70e 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -569,6 +569,7 @@ function loginSuccess(client) {
 	if(doesServerHaveTesterOnlyEnabled()) {
 		if(!hasBitFlag(getPlayerData(client).accountData.flags.moderation, getModerationFlagValue("IsTester"))) {
 			setTimeout(function() {
+				getPlayerData(client).customDisconnectReason = "Kicked - Not a tester";
 				client.disconnect();
 			}, 3500);
 
diff --git a/scripts/server/event.js b/scripts/server/event.js
index 4f4e1ccc..b10b1780 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -60,7 +60,8 @@ function onPlayerJoin(event, client) {
         fadeCamera(client, true, 1.0);
     }
 
-    messageDiscordEventChannel(`👋 ${getPlayerDisplayForConsole(client)} has joined the server.`);
+    messageAdmins(`${client.name} is joining the server ...`);
+    //messageDiscordEventChannel(`👋 ${getPlayerDisplayForConsole(client)} has joined the server.`);
 }
 
 // ===========================================================================
@@ -97,7 +98,11 @@ function onPlayerQuit(event, client, quitReasonId) {
     updateConnectionLogOnQuit(client, quitReasonId);
 
     if(isPlayerLoggedIn(client)) {
-        messagePlayerNormal(null, `👋 ${getPlayerName(client)} has left the server (${disconnectReasons[quitReasonId]})`, getColourByName("softYellow"));
+        let reasonText = disconnectReasons[quitReasonId];
+        if(getPlayerData(client).customDisconnectReason != "") {
+            reasonText = getPlayerData(client).customDisconnectReason;
+        }
+        messagePlayerNormal(null, `👋 ${getPlayerName(client)} has left the server (${reasonText})`, getColourByName("softYellow"));
         savePlayerToDatabase(client);
         resetClientStuff(client);
         getServerData().clients[client.index] = null;
@@ -587,8 +592,8 @@ function onPlayerSpawn(client) {
 
     if(!areServerElementsSupported()) {
         sendAllBusinessesToPlayer(client);
-        //sendAllHousesToPlayer(client);
-        //sendAllJobLocationsToPlayer(client);
+        sendAllHousesToPlayer(client);
+        sendAllJobsToPlayer(client);
         //sendAllVehiclesToPlayer(client);
 
         requestPlayerPedNetworkId(client);