diff --git a/Classic/scripts/autoexec/EnableLogs.cs b/Classic/scripts/autoexec/EnableLogs.cs
index a63ff64..ce06625 100644
--- a/Classic/scripts/autoexec/EnableLogs.cs
+++ b/Classic/scripts/autoexec/EnableLogs.cs
@@ -94,15 +94,22 @@ function ClassicChatLog(%client, %id, %team, %msg)
       return;
 
    // Don't log voicepack stuff.
-   if(strstr(%msg, "~w") != -1)
+   if(strstr(%msg, "~w") != -1 || strstr(%msg, "flag") != -1)
       return;
+  
+   %team = getTaggedString(Game.getTeamName(%team));
+
+   if(%team $= "Unassigned")
+	   %team = "Observer";
+   else if($CurrentMissionType $= "LakRabbit" || $CurrentMissionType $= "DM") 
+	   %team = $dtStats::gtNameLong[%client.lgame]; //from zDarktigerStats.cs
 
    switch$(%id)
    {
       case 0:
          %team = "[Global]";
       case 1:
-         %team = "["@getTaggedString(Game.getTeamName(%team))@"]";
+         %team = "[" @ %team @ "]";
       case 2:
          %team = "[Admin]";
       case 3:
@@ -111,10 +118,7 @@ function ClassicChatLog(%client, %id, %team, %msg)
          %team = "[Centerprint]";
    }
 
-   // Make it all uppercase
-   %team = strupr(%team);
-
-   $ClassicChatLog = "["@formattimestring("H:nn:ss")@"]" SPC %team SPC getTaggedString(%client.name) @": "@%msg;
+   $ClassicChatLog = "["@formattimestring("H:nn:ss")@"] "@%team SPC getTaggedString(%client.name)@": "@%msg;
    $ClassicChatLog = stripChars($ClassicChatLog, "\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\x10\x11\co\cp");
    %path = $Host::ClassicChatLogPath @ formatTimeString("/yy/mm-MM/dd.log");
    export("$ClassicChatLog", %path, true);
diff --git a/Classic/scripts/autoexec/zDarkTigerStats.cs b/Classic/scripts/autoexec/zDarkTigerStats.cs
index e469396..2a968ba 100644
--- a/Classic/scripts/autoexec/zDarkTigerStats.cs
+++ b/Classic/scripts/autoexec/zDarkTigerStats.cs
@@ -235,7 +235,7 @@ $dtStats::gtNameShort["DMGame"] = "DM";
 $dtStats::gtNameShort["SCtFGame"] = "LCTF";
 $dtStats::gtNameShort["ArenaGame"] = "Arena"; 
 $dtStats::gtNameShort["DuelGame"] = "Duel"; 
-//Display name 
+//Display name - rely on these in tacoserver enablelogs.cs
 $dtStats::gtNameLong["CTFGame"] = "Capture the Flag";
 $dtStats::gtNameLong["LakRabbitGame"] = "LakRabbit";
 $dtStats::gtNameLong["DMGame"] = "Deathmatch";