diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index e2f4b0d0c..c7adc4909 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -116,8 +116,18 @@ int main(int argc, char *argv[])
 	}
 	else
 	{
-		// true: note auto-login is active
-		RsInit::LoadCertificates(true);
+
+            std::string preferredId, gpgId, gpgName, gpgEmail, sslName;
+            RsInit::getPreferedAccountId(preferredId);
+
+            if (RsInit::getAccountDetails(preferredId,
+                            gpgId, gpgName, gpgEmail, sslName))
+            {
+                    RsInit::SelectGPGAccount(gpgId);
+            }
+
+            // true: note auto-login is active
+            RsInit::LoadCertificates(true);
 	}
 
 	rsicontrol->StartupRetroShare();