diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index da21d5e69a694c9ea3f74caa4c300fb95dd8f1ec..98fe286d1621ab5b00219d57b435cb50a6bf9a5f 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -1325,8 +1325,10 @@ void LLPanelLogin::onSelectServer()
 	switch (index)
 	{
 	case 0: // last location
+        LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_LAST));
+        break;
 	case 1: // home location
-		// do nothing - these are grid-agnostic locations
+        LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME));
 		break;
 		
 	default: