diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2cf0e9d3ac..d501b7f32e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2125,11 +2125,12 @@ namespace OpenSim.Region.Framework.Scenes
                 if (!gotCrossUpdate && !isNPC)
                     Scene.SendLayerData(ControllingClient);
 
-                // HG delay
-                if((m_teleportFlags & TeleportFlags.ViaHGLogin) != 0)
+                // HG
+                bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
+                if(isHGTP)
                 {
-                    Thread.Sleep(500);
-                    m_log.DebugFormat("[CompleteMovement] HG delay: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+//                    ControllingClient.SendNameReply(m_uuid, Firstname, Lastname);
+                    m_log.DebugFormat("[CompleteMovement] HG");
                 }
 
                 m_previusParcelHide = false;
@@ -2151,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes
                         cachedbaked = true;
                     else
                     {
-                        if (m_scene.AvatarFactory != null)
+                        if (m_scene.AvatarFactory != null && !isHGTP)
                             cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
 
                         // not sure we need this