diff --git a/Server/Events/Connect.cs b/Server/Events/Connect.cs
index 43f8c7e1..2ae700b8 100644
--- a/Server/Events/Connect.cs
+++ b/Server/Events/Connect.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using GTANetworkAPI;
@@ -20,10 +21,20 @@ namespace reallife_gamemode.Server.Events
 {
     class Connect : Script
     {
+        private List<string> whitelistNames = new List<string>()
+        {
+            "VegasZ",
+            "datgame_",
+            "xSprite",
+            "xPrike",
+            "balboistderbeste"
+        };
+
+
         [ServerEvent(Event.PlayerConnected)]
         public void OnPlayerConnected(Client player)
         {
-            if(!(player.SocialClubName == "VegasZ") || !(player.SocialClubName == "datgame_") || !(player.SocialClubName == "xSprite"))
+            if(!whitelistNames.Any(x => x == player.SocialClubName))
             {
                 player.TriggerEvent("disableLogin");
                 player.Kick();
diff --git a/Server/Events/Disconnect.cs b/Server/Events/Disconnect.cs
index b79a75e1..bbcd959f 100644
--- a/Server/Events/Disconnect.cs
+++ b/Server/Events/Disconnect.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using GTANetworkAPI;
+using reallife_gamemode.Server.Extensions;
 
 /**
 * @overview Life of German Reallife - Event Login (Login.cs)
@@ -17,6 +18,8 @@ namespace reallife_gamemode.Server.Events
         [ServerEvent(Event.PlayerDisconnected)]
         public void OnPlayerDisconnected(Client player, DisconnectionType type, string reason)
         {
+            if (!player.IsLoggedIn()) return;
+
             if (type == DisconnectionType.Left)
             {
                 NAPI.Util.ConsoleOutput(player.Name + " left");