diff --git a/addons/sourcemod/scripting/shavit-stats.sp b/addons/sourcemod/scripting/shavit-stats.sp
index 85201854..828ded6b 100644
--- a/addons/sourcemod/scripting/shavit-stats.sp
+++ b/addons/sourcemod/scripting/shavit-stats.sp
@@ -574,9 +574,6 @@ public Action Command_MapsDoneLeft(int client, int args)
 			{
 				return Plugin_Handled;
 			}
-
-			GetClientName(target, gS_TargetName[client], sizeof(gS_TargetName[]));
-			iSteamID = GetSteamAccountID(target);
 		}
 		else
 		{
@@ -584,6 +581,12 @@ public Action Command_MapsDoneLeft(int client, int args)
 		}
 	}
 
+	if (iSteamID < 1)
+	{
+		GetClientName(target, gS_TargetName[client], sizeof(gS_TargetName[]));
+		iSteamID = GetSteamAccountID(target);
+	}
+
 	gI_TargetSteamID[client] = iSteamID;
 
 	char sCommand[16];