diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index fd4b324df..efb8646a9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -120,7 +120,15 @@ public class CoreClientManager extends MiniPlugin
 					if(client.getDisguisedAs().equalsIgnoreCase(name))
 						return client;
 			}
-			return _clientList.get(name);
+			CoreClient client = _clientList.get(name);
+			
+			if (client == null)
+			{
+				client = new CoreClient(name);
+				client.SetRank(Rank.ALL);
+			}
+			
+			return client;
 		}
 	}