diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 1e55633bfb..ef6603d1ce 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -475,10 +475,10 @@ namespace OpenSim.Region.Environment
             fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
             fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
             fullSimParcel.parcelData.parcelDesc = "";
-
             fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
             fullSimParcel.parcelData.salePrice = 1;
-            fullSimParcel.parcelData.parcelFlags |= (uint)libsecondlife.Parcel.ParcelFlags.ForSale;
+
+            fullSimParcel.parcelData.parcelFlags |=(uint)libsecondlife.Parcel.ParcelFlags.ForSale;
             fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
 
             addParcel(fullSimParcel);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index b86e5c8cb8..f9b3145ecb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -141,6 +141,12 @@ namespace OpenSim.Region.Environment.Scenes
         {
             // Console.WriteLine("Chat message");
             ScenePresence avatar = null;
+            if (this.Avatars.ContainsKey(fromAgentID))
+            {
+                avatar = this.Avatars[fromAgentID];
+                fromPos = avatar.Pos;
+                fromName = avatar.firstname + " " + avatar.lastname;
+            }
 
             m_clientManager.ForEachClient(delegate(IClientAPI client)
                                               {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bd3d931531..a1b060f1fe 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnObjectName += this.PrimName;
             client.OnLinkObjects += this.LinkObjects;
             client.OnObjectDuplicate += this.DuplicateObject;
-
+            
             client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
             client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
             client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);