diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c2aa8e2537..ffe6fe934f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5521,6 +5521,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId)
             {
+                // Linden Client limitation..     
+                if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.X == 255.5f
+                    || avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y == 255.5f)
+                {
+                    ScenePresence avatar = null;
+                    if (((Scene)m_scene).TryGetAvatar(AgentId, out avatar))
+                    {
+                        if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.X == 255.5f)
+                        {
+                            avSetStartLocationRequestPacket.StartLocationData.LocationPos.X = avatar.AbsolutePosition.X;
+                        }
+                        if (avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y == 255.5f)
+                        {
+                            avSetStartLocationRequestPacket.StartLocationData.LocationPos.Y = avatar.AbsolutePosition.Y;
+                        }
+                    }
+
+                }
                 TeleportLocationRequest handlerSetStartLocationRequest = OnSetStartLocationRequest;
                 if (handlerSetStartLocationRequest != null)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 08b7115502..a22fb5fc16 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3034,24 +3034,6 @@ namespace OpenSim.Region.Framework.Scenes
                 // TODO: The next line can be removed, as soon as only homeRegionID based UserServers are around.
                 // TODO: The HomeRegion property can be removed then, too
                 UserProfile.HomeRegion = RegionInfo.RegionHandle;
-                
-                // Linden Client limitation..     
-                if (position.X == 255.5f || position.Y == 255.5f)
-                {
-                    ScenePresence avatar = null;
-                    if (TryGetAvatar(remoteClient.AgentId, out avatar))
-                    {
-                        if (position.X == 255.5f)
-                        {
-                            position.X = avatar.AbsolutePosition.X;
-                        }
-                        if (position.Y == 255.5f)
-                        {
-                            position.Y = avatar.AbsolutePosition.Y;
-                        }
-                    }
-                        
-                }
 
                 UserProfile.HomeLocation = position;
                 UserProfile.HomeLookAt = lookAt;