diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs
index bd56b60..1c0b3c5 100644
--- a/Classic/scripts/autoexec/VoteMenu.cs
+++ b/Classic/scripts/autoexec/VoteMenu.cs
@@ -181,7 +181,11 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
 		%client.adminVoteSet = 0;
 		return;
 	}
-
+	
+	// Show smurf names correctly
+	if(%client.isSmurf)
+	   %client.nameBase = stripChars( detag( getTaggedString( %client.name ) ), "\cp\co\c6\c7\c8\c9" );
+  
 	%teamSpecific = 0;
 	switch$(%typeName)
 	{
diff --git a/Classic/scripts/defaultGame.cs b/Classic/scripts/defaultGame.cs
index 8faef77..6321a9f 100644
--- a/Classic/scripts/defaultGame.cs
+++ b/Classic/scripts/defaultGame.cs
@@ -1210,7 +1210,7 @@ function cmdAutoKickObserver(%client, %key) // Edit GG
 
    if ( isObject( %client ) )
    {
-      messageAll('MsgAdminForce', '\c2%1 has left the game. (Observer Timeout)', %client.nameBase);
+      messageAll('MsgAdminForce', '\c2%1 has left the game. (Observer Timeout)', %client.name);
 
       %client.setDisconnectReason( "Observer Timeout" );
       %client.schedule(700, "delete");