diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 96e7919f3a..f765cfe725 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -845,6 +845,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+            // If the sender is an object, check owner instead
+            //
+            SceneObjectPart part = startScene.GetSceneObjectPart(user);
+            if (part != null)
+                user = part.OwnerID;
+
             return GenericCommunicationPermission(user, target);
         }