diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index a093c9d7d9..a815662f26 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -244,7 +244,7 @@ namespace OpenSim.Framework.UserManagement
         {
             return
                 (GenerateFailureResponse("presence",
-                                         "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner",
+                                         "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner. Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.",
                                          "false"));
         }
 
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index dede60787a..72b408b056 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Framework.UserManagement
                         //      If agentOnline could not turn from true back to false normally
                         //      because of some problem, for instance, the crashment of server or client,
                         //      the user cannot log in any longer.
-                        userProfile.currentAgent = null;
+                        userProfile.currentAgent.agentOnline = false;
                         m_userManager.CommitAgent(ref userProfile);
 
                         // Reject the login