diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 78e3a83f40..1a3971d1b1 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1434,6 +1434,9 @@ namespace OpenSim.Region.Environment.Scenes
                             foreach (UUID taskID in taskIDict.Keys)
                             {
                                 UnRegisterControlEventsToScript(LocalId, taskID);
+				taskIDict[taskID].PermsMask &= ~(
+					2048 | //PERMISSION_CONTROL_CAMERA
+					4); // PERMISSION_TAKE_CONTROLS
                             }
                         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 34a3a26acd..393e70804f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2958,7 +2958,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // When agent is sitting, certain permissions are implicit if requested from sitting agent
                 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
                         ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
-                        ScriptBaseClass.PERMISSION_TRACK_CAMERA;
+                        ScriptBaseClass.PERMISSION_TRACK_CAMERA |
+			ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
 
                 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
                 {