diff --git a/Server/Services/ClientService.cs b/Server/Services/ClientService.cs
index f5459efa..2cd766f9 100644
--- a/Server/Services/ClientService.cs
+++ b/Server/Services/ClientService.cs
@@ -24,6 +24,13 @@ namespace reallife_gamemode.Server.Services
             name = name.ToLower();
 
             List<Client> playerList = NAPI.Pools.GetAllPlayers();
+
+            if(int.TryParse(name, out int id))
+            {
+                toReturn = playerList.Find(p => p.Handle.Value == id);
+                return toReturn;
+            }
+            
             toReturn = playerList.Find(p => p.Name.ToLower() == name);
 
             if(toReturn == null)