diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 73f83510c..ac57bff13 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -1131,7 +1131,14 @@ int RsInit::LoadCertificates(bool autoLoginNT)
 
 	if(helpFile != NULL){
 		have_help = true;
-		fclose(helpFile);
+                fclose(helpFile);
+
+                if(RsInitConfig::passwd == ""){ // in case user chooses a different user later in setup
+                    RsInitConfig::havePasswd = RsTryAutoLogin();
+                    have_help = RsInitConfig::havePasswd;
+                }
+
+
 	}
 
 	/* The SSL / SSL + PGP version requires, SSL init + PGP init.  */
@@ -1142,7 +1149,7 @@ int RsInit::LoadCertificates(bool autoLoginNT)
 	//check if password is already in memory
 	if (((RsInitConfig::havePasswd) && (RsInitConfig::passwd != "")) && !have_help)
 	{
-		std::cerr << "RetroShare has a ssl Password" << std::endl;
+                std::cerr << "RetroShare has an ssl Password" << std::endl;
 		sslPassword = RsInitConfig::passwd.c_str();
 
 		std::cerr << "let's store the ssl Password into a pgp ecrypted file" << std::endl;