diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 34639b08b2..20ab7d22f9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2413,15 +2413,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return string.Empty;
             }
 
-            // Check if the user is already cached
-
+            // Check local grid
             UUID userID = userManager.GetUserIdByName(firstname, lastname);
             if (userID != UUID.Zero)
                 return userID.ToString();
 
-            // Query for the user
-
-            String realFirstName; String realLastName; String serverURI;
+            // HG ?
+            string realFirstName;
+            string realLastName;
+            string serverURI;
             if (Util.ParseForeignAvatarName(firstname, lastname, out realFirstName, out realLastName, out serverURI))
             {
                 try
@@ -2443,12 +2443,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // m_log.Warn("[osAvatarName2Key] UserAgentServiceConnector - Unable to connect to destination grid ", e);
                 }
             }
-            else
-            {
-                UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, firstname, lastname);
-                if (account != null)
-                    return account.PrincipalID.ToString();
-            }
 
             return UUID.Zero.ToString();
         }