diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index da52ac408c..854d9d785b 100755
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -200,5 +200,9 @@ LLPointer<LLCredential> LLLoginHandler::loadSavedUserLoginInfo()
 		return gSecAPIHandler->createCredential(identifier["first_name"].asString() + " " + identifier["last_name"].asString() + "@" +LLGridManager::getInstance()->getGrid(),
 												identifier, authenticator);
 	}
-	return NULL;
+	// <FS:Zi> Fix --autologin by loading the currently selected credentials if the above fails.
+	//         UserLoginInfo contains "First Last @ Grid" and gets set in LLPanelLogin::onClickConnect()
+	// return NULL;
+	return gSecAPIHandler->loadCredential(gSavedSettings.getLLSD("UserLoginInfo"));
+	// </FS:Zi>
 }