diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index 39f3c0f113971034d1fd5daf00934bca7a68f47a..eca34c0d4d47ae1bf7521ee1175b370bd1ddfba9 100644
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -168,7 +168,6 @@ LLPointer<LLCredential> LLLoginHandler::loadSavedUserLoginInfo()
 		authenticator["algorithm"] = "md5";
 		authenticator["secret"] = md5pass;
 		// yuck, we'll fix this with mani's changes.
-		gSavedSettings.setBOOL("AutoLogin", TRUE);
 		return gSecAPIHandler->createCredential(LLGridManager::getInstance()->getGrid(), 
 													   identifier, authenticator);
 	}
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index bbbc93e5be3b0865db2908c074dc5db7b09dc1bb..628b419304018ec4aee47de1cc100eb8ad9adae9 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -683,10 +683,17 @@ bool idle_startup()
 		}
 		else if (gSavedSettings.getBOOL("AutoLogin"))  
 		{
+			// Log into last account
 			gRememberPassword = TRUE;
 			gSavedSettings.setBOOL("RememberPassword", TRUE);                                                      
 			show_connect_box = false;    			
 		}
+		else if (gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
+		{
+			// Console provided login&password
+			gRememberPassword = gSavedSettings.getBOOL("RememberPassword");
+			show_connect_box = false;
+		}
 		else 
 		{
 			gRememberPassword = gSavedSettings.getBOOL("RememberPassword");