diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b143f3e531..2f602e6aff 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2662,9 +2662,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
             edata.CovenantID = covenant;
             edata.CovenantTimestamp = 0;
-            edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
-            edata.EstateName =
-                Helpers.StringToField(m_scene.RegionInfo.MasterAvatarFirstName + " " + m_scene.RegionInfo.MasterAvatarLastName);
+            if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
+                edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+            else
+                edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+            edata.EstateName = m_scene.RegionInfo.EstateSettings.EstateName;
             einfopack.Data = edata;
             this.OutPacket(einfopack, ThrottleOutPacketType.Task);
         }