diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index bba928ff8b..5fa2f58956 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework
         {
             if(OnExpectUser != null)
             {
+                
                 OnExpectUser(regionHandle, agent);
                 return true;
             }
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 48e692278c..0fba6caa15 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationX");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
                     configData.SetAttribute("SimLocationX", location);
                     this.RegionLocX = (uint)Convert.ToUInt32(location);
                 }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationY");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
                     configData.SetAttribute("SimLocationY", location);
                     this.RegionLocY = (uint)Convert.ToUInt32(location);
                 }
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 04ff20b591..263dba2504 100644
--- a/OpenSim/Framework/General/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
         {
             Circuits = new Dictionary<LLUUID, uint>();
             Inventory = new AgentInventory();
-            homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
+            homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
             homepos = new LLVector3();
 	    homelookat = new LLVector3();
         }
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 5ca223fa66..d1cd8cf576 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.UserManagement
                 this.ErrorReason = "key";
                 this.welcomeMessage = "Welcome to OpenSim!";
                 this.seedCapability = "";
-                this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
+                this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
                 this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
                 this.RegionX = (uint)255232;
                 this.RegionY = (uint)254976;
@@ -227,6 +227,7 @@ namespace OpenSim.Framework.UserManagement
 
                 responseData["sim_port"] =(Int32) this.SimPort;
                 responseData["sim_ip"] = this.SimAddress;
+                Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
                 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
                 responseData["session_id"] = this.SessionID.ToStringHyphenated();
                 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index bc35164d9c..d06059e927 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -472,7 +472,6 @@ namespace OpenSim.Framework.UserManagement
                         return logResponse.CreateDeadRegionResponse();
                     }
                     CommitAgent(ref TheUser);
-
                     return logResponse.ToXmlRpcResponse();
 
                 }
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ae47890744..26834be764 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -182,7 +182,6 @@ namespace OpenSim.Region.Communications.Local
         /// <returns></returns>
         public bool AddNewSession(ulong regionHandle, Login loginData)
         {
-            //Console.WriteLine(" comms manager been told to expect new user");
             AgentCircuitData agent = new AgentCircuitData();
             agent.AgentID = loginData.Agent;
             agent.firstname = loginData.First;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 508a3f9b0c..6cf254bd8b 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
                  "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
                  "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
                 string capsPath = Util.GetRandomCapsPath();
-                response.SimAddress = reg.CommsIPListenAddr;
+                response.SimAddress = reg.CommsExternalAddress;
                 response.SimPort = (Int32)reg.CommsIPListenPort;
                 response.RegionX = reg.RegionLocX ;
                 response.RegionY = reg.RegionLocY ;