diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 1f94f0a22aee251525f0e1e6f846b2b64d32243c..417419d13cbc356ca112d469234fcecd6460a333 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2828,16 +2828,14 @@ void LLStartUp::setStartSLURL(const LLSLURL& slurl)
   switch(slurl.getType())
     {
     case LLSLURL::HOME_LOCATION:
-		gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_HOME);
-		break;
     case LLSLURL::LAST_LOCATION:
-		gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_LAST);
+    case LLSLURL::LOCATION:
+		gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_HOME);
+		LLPanelLogin::onUpdateStartSLURL(slurl); // updates grid if needed
 		break;
     default:
 		break;
     }
-
-  LLPanelLogin::onUpdateStartSLURL(slurl); // updates grid if needed
 }
 
 /**