diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 3196e391e1adc2e94a82dedd2ad6f60416122725..b2baff02f767f7f1af055e92070be517c07d10a1 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -918,13 +918,10 @@ void LLPanelLogin::updateServer()
 				sInstance->setFields(credential, remember);
 			}
 
-			// update the login panel links 
-			bool system_grid = LLGridManager::getInstance()->isSystemGrid();
-
 			// Want to vanish not only create_new_account_btn, but also the
 			// title text over it, so turn on/off the whole layout_panel element.
-			sInstance->getChild<LLLayoutPanel>("links")->setVisible(system_grid);
-			sInstance->getChildView("forgot_password_text")->setVisible(system_grid);
+			sInstance->getChild<LLLayoutPanel>("links")->setVisible(!LLGridManager::getInstance()->getCreateAccountURL().empty());
+			sInstance->getChildView("forgot_password_text")->setVisible(!LLGridManager::getInstance()->getForgotPasswordURL().empty());
 
 			// grid changed so show new splash screen (possibly)
 			loadLoginPage();