diff --git a/Programs/Simian/Extensions/ConnectionManagement.cs b/Programs/Simian/Extensions/ConnectionManagement.cs
index bd4802ff..8f99bf1e 100644
--- a/Programs/Simian/Extensions/ConnectionManagement.cs
+++ b/Programs/Simian/Extensions/ConnectionManagement.cs
@@ -88,10 +88,10 @@ namespace Simian
                     kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
                     kill.ObjectData[0].ID = agent.Avatar.LocalID;
 
+                    server.Agents.Remove(agent.Address);
+
                     foreach (Agent recipient in server.Agents.Values)
                         recipient.SendPacket(kill);
-
-                    server.Agents.Remove(agent.Address);
                 }
             }
         }
diff --git a/Programs/Simian/Extensions/Movement.cs b/Programs/Simian/Extensions/Movement.cs
index 5bef1364..62b98d76 100644
--- a/Programs/Simian/Extensions/Movement.cs
+++ b/Programs/Simian/Extensions/Movement.cs
@@ -137,7 +137,7 @@ namespace Simian.Extensions
             update.ObjectData[0].JointType = (byte)0;
             update.ObjectData[0].Material = (byte)3;
             update.ObjectData[0].MediaURL = new byte[0];
-            update.ObjectData[0].NameValue = new byte[0];
+            update.ObjectData[0].NameValue = Utils.StringToBytes(agent.Avatar.Name);
             update.ObjectData[0].ObjectData = objectData;
             update.ObjectData[0].OwnerID = UUID.Zero;
             update.ObjectData[0].ParentID = 0;
diff --git a/Programs/Simian/Extensions/SceneManager.cs b/Programs/Simian/Extensions/SceneManager.cs
index b472bffd..62fdf3b6 100644
--- a/Programs/Simian/Extensions/SceneManager.cs
+++ b/Programs/Simian/Extensions/SceneManager.cs
@@ -34,11 +34,21 @@ namespace Simian
             // Create a representation for this agent
             Avatar avatar = new Avatar();
             avatar.ID = agent.AgentID;
+            avatar.NameValues = agent.Avatar.NameValues;
             avatar.LocalID = (uint)Interlocked.Increment(ref currentLocalID);
             avatar.Position = new Vector3(128f, 128f, 25f);
             avatar.Rotation = Quaternion.Identity;
             avatar.Scale = new Vector3(1f, 1f, 3f);
 
+            NameValue[] name = new NameValue[2];
+            name[0] = new NameValue();
+            name[0].Name = "FirstName";
+            name[0].Value = agent.FirstName;
+            name[1] = new NameValue();
+            name[1].Name = "LastName";
+            name[1].Value = agent.LastName;
+            avatar.NameValues = name;
+
             // Link this avatar up with the corresponding agent
             agent.Avatar = avatar;