diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 5ab21d449..bafedd9f3 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -266,8 +266,8 @@ LLPanelLogin::LLPanelLogin(const LLRect& rect)
 	location_combo->setFocusLostCallback( boost::bind(&LLPanelLogin::onLocationSLURL, this) );
 	
 	LLComboBox* server_choice_combo = getChild<LLComboBox>("grids_combo");
-	server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectGrid, _1));
-	server_choice_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onSelectGrid, server_choice_combo));
+	server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectGrid, this, _1));
+	server_choice_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onSelectGrid, this, server_choice_combo));
 	
 	// Load all of the grids, sorted, and then add a bar and the current grid at the top
 	updateGridCombo();
@@ -1111,7 +1111,7 @@ void LLPanelLogin::onSelectGrid(LLUICtrl *ctrl)
 	}
 	gHippoGridManager->setCurrentGrid(grid);
 	ctrl->setValue(grid);
-	sInstance->addFavoritesToStartLocation();
+	addFavoritesToStartLocation();
 
 	/*
 	 * Determine whether or not the value in the start_location_combo makes sense
@@ -1123,7 +1123,7 @@ void LLPanelLogin::onSelectGrid(LLUICtrl *ctrl)
 	 * https://grid.example.com/region/Party%20Town/20/30/5 specify a particular
 	 * grid; in those cases we want to clear the location.
 	 */
-	auto location_combo = sInstance->getChild<LLComboBox>("start_location_combo");
+	auto location_combo = getChild<LLComboBox>("start_location_combo");
 	S32 index = location_combo->getCurrentIndex();
 	switch (index)
 	{
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 88b4a4c37..478588aa4 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -114,7 +114,7 @@ private:
 	static void onClickNewAccount();
 	static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
 	static void onClickGrids();
-	static void onSelectGrid(LLUICtrl *ctrl);
+	void onSelectGrid(LLUICtrl *ctrl);
 	static void onClickForgotPassword();
 	static void onPassKey();
 	static void onSelectLoginEntry(const LLSD& selected_entry);