diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 382793a497..9250b427af 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3607,7 +3607,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://lecs.viewer-sidebar.secondlife.com.s3.amazonaws.com/sidebar.html</string>
+      <string>http://lecs.viewer-sidebar.secondlife.com.s3.amazonaws.com/sidebar.html?p=[AUTH_TOKEN]&amp;lang=[LANGUAGE]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]</string>
     </map>
     <key>SearchURL</key>
     <map>
diff --git a/indra/newview/llviewerhome.cpp b/indra/newview/llviewerhome.cpp
index 6299b4fabd..8fdbe0a4ae 100644
--- a/indra/newview/llviewerhome.cpp
+++ b/indra/newview/llviewerhome.cpp
@@ -50,9 +50,18 @@ std::string LLViewerHome::getHomeURL()
 	LLSD substitution;
 	substitution["AUTH_TOKEN"] = LLURI::escape(getAuthKey());
 
-	// get the home URL and expand all of the substitutions
-	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
+	// get the home URL from the settings.xml file
 	std::string homeURL = gSavedSettings.getString("HomeSidePanelURL");
+
+	// support a grid-level override of the URL from login.cgi
+	LLSD grid_url = LLLoginInstance::getInstance()->getResponse("home_sidetray_url");
+	if (! grid_url.asString().empty())
+	{
+		homeURL = grid_url.asString();
+	}	
+
+	// expand all substitution strings in the URL and return it
+	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
 	return LLWeb::expandURLSubstitutions(homeURL, substitution);
 }