diff --git a/plugins/playercommands/rename.sp b/plugins/playercommands/rename.sp
index b3d6b9d0..17ceeba4 100644
--- a/plugins/playercommands/rename.sp
+++ b/plugins/playercommands/rename.sp
@@ -174,20 +174,22 @@ public Action Command_Rename(int client, int args)
 			ShowActivity2(client, "[SM] ", "%t", "Renamed target", "_s", target_name);
 		}
 
-		if (target_count > 1) /* We cannot name everyone the same thing. */
-		{
-			randomize = true;
-		}
-
 		for (int i = 0; i < target_count; i++)
 		{
-			if(randomize)
+			if (randomize)
 			{
 				RandomizeName(target_list[i]);
 			}
 			else
 			{
-				Format(g_NewName[target_list[i]], MAX_NAME_LENGTH, "%s", arg2);
+				if (target_count > 1)
+				{
+					Format(g_NewName[target_list[i]], MAX_NAME_LENGTH, "%s %i", arg2, i+1);
+				}
+				else
+				{
+					Format(g_NewName[target_list[i]], MAX_NAME_LENGTH, "%s", arg2);
+				}
 			}
 			PerformRename(client, target_list[i]);
 		}