diff --git a/indra/newview/app_settings/default_grids.xml b/indra/newview/app_settings/default_grids.xml
index 83b33cf15..5d8c2a088 100755
--- a/indra/newview/app_settings/default_grids.xml
+++ b/indra/newview/app_settings/default_grids.xml
@@ -2,33 +2,34 @@
   <array>
 
     <map>
-      <key>default_grids_version</key><string>1</string>
+      <key>default_grids_version</key><string>2</string>
     </map>
 
     <!-- Second Life -->
     <map>
-      <key>gridnick</key><string>secondlife</string>
-      <key>gridname</key><string>Agni</string>
+      <key>gridname</key><string>Second Life</string>
       <key>platform</key><string>SecondLife</string>
       <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
-      <key>loginpage</key><string>http://secondlife.com/app/login/</string>
+	  <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
       <key>helperuri</key><string>https://secondlife.com/helpers/</string>
       <key>website</key><string>http://secondlife.com/</string>
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
+      <key>render_compat</key><boolean>1</boolean>
+      <key>inventory_links</key><boolean>1</boolean>
     </map>
 
     <map>
-      <key>gridnick</key><string>secondlife_beta</string>
-      <key>gridname</key><string>Aditi</string>
+      <key>gridname</key><string>Second Life BETA</string>
       <key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
-      <key>loginpage</key><string>http://secondlife.com/app/login/</string>
+	  <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
       <key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
       <key>password</key><string>http://secondlife.com/account/request.php</string>
       <key>platform</key><string>SecondLife</string>
       <key>register</key><string>http://secondlife.com/registration/</string>
       <key>render_compat</key><boolean>0</boolean>
+      <key>inventory_links</key><boolean>1</boolean>
       <key>support</key><string>http://secondlife.com/support/</string>
       <key>version</key><integer>0</integer>
       <key>website</key><string>http://secondlife.com/</string>
@@ -37,7 +38,6 @@
 
     <!-- Local Host -->
     <map>
-      <key>gridnick</key><string>local</string>
       <key>gridname</key><string>Local Host</string>
       <key>platform</key><string>OpenSim</string>
       <key>loginuri</key><string>http://127.0.0.1:9000/</string>
diff --git a/indra/newview/hippogridmanager.cpp b/indra/newview/hippogridmanager.cpp
index 22989cb43..85ee8a369 100644
--- a/indra/newview/hippogridmanager.cpp
+++ b/indra/newview/hippogridmanager.cpp
@@ -796,7 +796,7 @@ void HippoGridManager::loadFromFile()
 {
 	mDefaultGridsVersion = 0;
 	// load user grid info
-	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg1.xml"), false);
+	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg2.xml"), false);
 	// merge default grid info, if newer. Force load, if list of grids is empty.
 	parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty());
 	// merge grid info from web site, if newer. Force load, if list of grids is empty.
@@ -957,7 +957,7 @@ void HippoGridManager::saveFile()
 	}
 
 	// write client grid info file
-	std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg1.xml");
+	std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids_sg2.xml");
 	llofstream file;
 	file.open(fileName.c_str());
 	if (file.is_open()) 
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index fde18272d..4db5502f4 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -942,7 +942,6 @@ void LLPanelLogin::loadLoginPage()
 	}
 
 	// Grid
-	oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());
 
 	if (gHippoGridManager->getConnectedGrid()->isSecondLife()) {
 		// find second life grid from login URI
@@ -960,6 +959,11 @@ void LLPanelLogin::loadLoginPage()
 			}
 		}
 	}
+	else
+	{
+		oStr << "&grid=" << LLWeb::curlEscape(LLViewerLogin::getInstance()->getGridLabel());
+	}
+		
 	
 	gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
 	gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());