diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index f9a0bdb543..0dfcb44176 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -238,7 +238,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             // If there is no master avatar, return false
             if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
             {
-                return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
+                if(m_scene.RegionInfo.MasterAvatarAssignedUUID == user)
+                    return true;
+            }
+            if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
+            {
+                if(m_scene.RegionInfo.EstateSettings.EstateOwner == user)
+                    return true;
             }
 
             return false;