diff --git a/MudEngine/Commands/CommandLogin.cs b/MudEngine/Commands/CommandLogin.cs
index dfde83b..f667a22 100644
--- a/MudEngine/Commands/CommandLogin.cs
+++ b/MudEngine/Commands/CommandLogin.cs
@@ -42,8 +42,13 @@ namespace MudEngine.Commands
 
                 if (!foundName)
                 {
-                    isLegal = true;
-                    player.Name = input;
+                    if (input == "")
+                        continue;
+                    else
+                    {
+                        isLegal = true;
+                        player.Name = input;
+                    }
                 }
             }
 
diff --git a/MudEngine/GameObjects/Characters/BaseCharacter.cs b/MudEngine/GameObjects/Characters/BaseCharacter.cs
index d405a52..0fa4b6d 100644
--- a/MudEngine/GameObjects/Characters/BaseCharacter.cs
+++ b/MudEngine/GameObjects/Characters/BaseCharacter.cs
@@ -214,6 +214,8 @@ namespace MudEngine.GameObjects.Characters
                             String str;
                             List<byte> correctedBuffer = new List<byte>();
                             System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
+
+                            /*
                             foreach (byte i in buffer)
                             {
                                 if (i == 255)
@@ -223,7 +225,8 @@ namespace MudEngine.GameObjects.Characters
                                 else
                                     correctedBuffer.Add(i);
                             }
-                            str = enc.GetString(correctedBuffer.ToArray());
+                             */
+                            str = enc.GetString(buffer.ToArray());
                             return str;
                         }
                         else