diff --git a/MCGalaxy/Chat/ChatTokens.cs b/MCGalaxy/Chat/ChatTokens.cs
index f39c3c157..0865c2372 100644
--- a/MCGalaxy/Chat/ChatTokens.cs
+++ b/MCGalaxy/Chat/ChatTokens.cs
@@ -102,7 +102,7 @@ namespace MCGalaxy {
         };
 
         static string TokenDate(Player p) { return DateTime.Now.ToString("yyyy-MM-dd"); }
-        static string TokenTime(Player p) { return DateTime.Now.ToString("HH:mm:ss"); }
+        static string TokenTime(Player p) { return DateTime.Now.ToString("hh:mm tt"); }
         static string TokenIRC(Player p) { return Server.Config.IRCServer + " > " + Server.Config.IRCChannels; }
         static string TokenBanned(Player p) { return Group.BannedRank.Players.Count.ToString(); }
         static string TokenServerName(Player p) { return Server.Config.Name; }
diff --git a/MCGalaxy/Chat/ProfanityFilter.cs b/MCGalaxy/Chat/ProfanityFilter.cs
index 3ab0529c6..8d7e5a531 100644
--- a/MCGalaxy/Chat/ProfanityFilter.cs
+++ b/MCGalaxy/Chat/ProfanityFilter.cs
@@ -52,7 +52,7 @@ namespace MCGalaxy {
 
                 // If a bad word is found anywhere in the word, replace the word
                 int length = words[i].Length;               
-                words[i] = new String('*', length);
+                words[i] = "&c[&fBlocked&c]&f";
             }            
             return String.Join(" ", words);
         }
diff --git a/MCGalaxy/Commands/Chat/CmdNick.cs b/MCGalaxy/Commands/Chat/CmdNick.cs
index 88551ab60..2a0942137 100644
--- a/MCGalaxy/Commands/Chat/CmdNick.cs
+++ b/MCGalaxy/Commands/Chat/CmdNick.cs
@@ -61,7 +61,7 @@ namespace MCGalaxy.Commands.Chatting {
                 Chat.MessageFrom(who, "λNICK %Shad their custom nick reset");
                 who.DisplayName = who.truename;
             } else {
-                if (nick.Length >= 30) { p.Message("Nick must be under 30 letters."); return; }     
+                if (Colors.Strip(nick).Length >= 30) { p.Message("Nick must be under 30 letters."); return; }
                 
                 Chat.MessageFrom(who, "λNICK %Shad their nick set to " + who.color + nick);
                 who.DisplayName = nick;