diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 5a81c44b..ffea76db 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -693,12 +693,24 @@ namespace TShockAPI
 			var players = TShock.Utils.FindPlayer(args.Parameters[0]);
 			if (players.Count > 1)
 			{
-				args.Player.SendMessage("More than one player matched your query.", Color.Red);
+                var plrMatches = "";
+                foreach (TSPlayer plr in players)
+                {
+                    if (plrMatches.Length != 0)
+                    {
+                        plrMatches += ", " + plr.Name;
+                    }
+                    else
+                    {
+                        plrMatches += plr.Name;
+                    }
+                }
+                args.Player.SendMessage("More than one player matched! Matches: " + plrMatches, Color.Red);
 				return;
 			}
 			try
 			{
-				args.Player.SendMessage("IP Address: " + players[0].IP + " Logged In As: " + players[0].UserAccountName, Color.Green);
+                args.Player.SendMessage("IP Address: " + players[0].IP + " Logged In As: " + players[0].UserAccountName + "Group: " + players[0].Group.Name, Color.Green);
 			}
 			catch (Exception)
 			{
@@ -727,8 +739,20 @@ namespace TShockAPI
 			}
 			else if (players.Count > 1)
 			{
-				args.Player.SendMessage("More than one player matched!", Color.Red);
-			}
+                var plrMatches = "";
+                foreach (TSPlayer plr in players)
+                {
+                    if (plrMatches.Length != 0)
+                    {
+                        plrMatches += ", " + plr.Name;
+                    }
+                    else
+                    {
+                        plrMatches += plr.Name;
+                    }
+                }
+                args.Player.SendMessage("More than one player matched! Matches: " + plrMatches, Color.Red);
+            }
 			else
 			{
 				string reason = args.Parameters.Count > 1
@@ -762,8 +786,20 @@ namespace TShockAPI
 			}
 			else if (players.Count > 1)
 			{
-				args.Player.SendMessage("More than one player matched!", Color.Red);
-			}
+                var plrMatches = "";
+                foreach (TSPlayer plr in players)
+                {
+                    if (plrMatches.Length != 0)
+                    {
+                        plrMatches += ", " + plr.Name;
+                    }
+                    else
+                    {
+                        plrMatches += plr.Name;
+                    }
+                }
+                args.Player.SendMessage("More than one player matched! Matches: " + plrMatches, Color.Red);
+            }
 			else
 			{
 				string reason = args.Parameters.Count > 1