diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp
index 3631acae3..cc6cd0bd3 100644
--- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp
+++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiLoginScreen.cpp
@@ -85,12 +85,19 @@ m_connecting      (false)
 	}
 	else
 	{
-		m_passwordTextbox->SetLocalText (Unicode::emptyString);
+		if (ConfigClientGame::getLoginClientID()) {
+			m_usernameTextbox->SetLocalText(Unicode::narrowToWide(ConfigClientGame::getLoginClientID()));
+		}
+		else {
+			m_usernameTextbox->SetLocalText(Unicode::emptyString);
+		}
 
-		if (ConfigClientGame::getLoginClientID ())
-			m_usernameTextbox->SetLocalText (Unicode::narrowToWide (ConfigClientGame::getLoginClientID ()));
-		else
-			m_usernameTextbox->SetLocalText (Unicode::emptyString);
+		if (ConfigClientGame::getLoginClientPassword()) {
+			m_passwordTextbox->SetLocalText(Unicode::narrowToWide(ConfigClientGame::getLoginClientPassword()));
+		}
+		else {
+			m_passwordTextbox->SetLocalText(Unicode::emptyString);
+		}
 	}
 
 	DEBUG_REPORT_LOG_PRINT (true, ("SwgCuiLoginScreen: username=%s, sessionId=%s\n", ConfigClientGame::getLoginClientID (), sessionId ? sessionId : "null"));