diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index ce0bf192..db92ca85 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1117,11 +1117,10 @@ namespace TShockAPI
 					TShock.Log.ConsoleInfo(args.Player.Name + " changed account " + account.Name + " to group " + args.Parameters[2] + ".");
 					args.Player.SendSuccessMessage("Account " + account.Name + " has been changed to group " + args.Parameters[2] + "!");
 					
-					var players = TSPlayer.FindByNameOrID(account.Name);
-					if (players.Count == 0)
-						return;
-					else if (!args.Silent)
-						players[0].SendSuccessMessage($"{args.Player.Name} has changed your group to {args.Parameters[2]}");
+					//send message to player with matching account name
+					var player = TShock.Players.FirstOrDefault(p => p != null && p.Account?.Name == account.Name)
+					if (player != null && !args.Silent)
+						player.SendSuccessMessage($"{args.Player.Name} has changed your group to {args.Parameters[2]}");
 				}
 				catch (GroupNotExistsException)
 				{