diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 6a3f464485..663ac0ca5f 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3692,12 +3692,13 @@ namespace OpenSim.Region.ScriptEngine.Common
             if (LLUUID.TryParse(id,out key))
             {
                 ScenePresence presence = World.GetScenePresence(key);
-
+                
                 if (presence != null)
                 {
-                    return presence.Name;
+                    return presence.ControllingClient.Name;
+                    //return presence.Name;
                 }
-
+                
                 if (World.GetSceneObjectPart(key) != null)
                 {
                     return World.GetSceneObjectPart(key).Name;