diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index f2b2720056..8b8d8dfa2b 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -114,6 +114,7 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Warn(string sender, string format, params object[] args)
         {
+            sender = sender.ToUpper();
             int colIdx = (sender.GetHashCode() % 6) + 9;
             ConsoleColor col = (ConsoleColor)colIdx;
 
@@ -141,6 +142,7 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Notice(string sender, string format, params object[] args)
         {
+            sender = sender.ToUpper();
             int colIdx = (sender.GetHashCode() % 6) + 9;
             ConsoleColor col = (ConsoleColor)colIdx;
 
@@ -168,6 +170,7 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Error(string sender, string format, params object[] args)
         {
+            sender = sender.ToUpper();
             int colIdx = (sender.GetHashCode() % 6) + 9;
             ConsoleColor col = (ConsoleColor)colIdx;
 
@@ -195,6 +198,7 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Verbose(string sender, string format, params object[] args)
         {
+            sender = sender.ToUpper();
             int colIdx = (sender.GetHashCode() % 6) + 9;
             ConsoleColor col = (ConsoleColor)colIdx;
 
@@ -222,6 +226,7 @@ namespace OpenSim.Framework.Console
         /// <param name="args">WriteLine-style message arguments</param>
         public void Status(string sender, string format, params object[] args)
         {
+            sender = sender.ToUpper();
             int colIdx = (sender.GetHashCode() % 6) + 9;
             ConsoleColor col = (ConsoleColor)colIdx;
 
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 111d40d4fb..32d8da973b 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Grid.UserServer
             httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod ));
             
             httpServer.Start();
-            m_console.Status("Userserver 0.3 - Startup complete");
+            m_console.Status("SERVER", "Userserver 0.3 - Startup complete");
         }
 
 
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index ec64bad333..340ef61f92 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -138,20 +138,20 @@ namespace OpenSim.Region.ClientStack
 
         public void ServerListener()
         {
-            m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
+            m_log.Status("SERVER", "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
 
             ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
             Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
             Server.Bind(ServerIncoming);
- 
-            m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
+
+            m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
 
             ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
             epSender = (EndPoint)ipeSender;
             ReceivedData = new AsyncCallback(this.OnReceivedData);
             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
 
-            m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");
+            m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - Listening...");
 
         }