diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc
index 03b6763a6..4698db395 100644
--- a/libretroshare/src/rsserver/rsloginhandler.cc
+++ b/libretroshare/src/rsserver/rsloginhandler.cc
@@ -249,14 +249,9 @@ bool RsLoginHandler::tryAutoLogin(const std::string& ssl_id,std::string& ssl_pas
 #else
 
 	/* try to load from file */
-	std::string entropy = RsInitConfig::load_cert;
+	std::string entropy = getSSLPasswdFileName(ssl_id);
 	/* get the data out */
 
-	/* open the data to the file */
-	std::string passwdfile = RsInitConfig::configDir;
-	passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator;
-	passwdfile += "help.dta";
-
 	DATA_BLOB DataIn;
 	DATA_BLOB DataEnt;
 	DATA_BLOB DataOut;
@@ -269,7 +264,8 @@ bool RsLoginHandler::tryAutoLogin(const std::string& ssl_id,std::string& ssl_pas
 	char *dataptr = NULL;
 	int   datalen = 0;
 
-	FILE *fp = fopen(passwdfile.c_str(), "rb");
+	/* open the data to the file */
+	FILE *fp = fopen(getAutologinFileName(ssl_id).c_str(), "rb");
 	if (fp != NULL)
 	{
 		fseek(fp, 0, SEEK_END);
@@ -445,7 +441,7 @@ bool RsLoginHandler::enableAutoLogin(const std::string& ssl_id,const std::string
 #else  /* windows */
 
 	/* store password encrypted in a file */
-	std::string entropy = RsInitConfig::load_cert;
+	std::string entropy = getSSLPasswdFileName(ssl_id);
 
 	DATA_BLOB DataIn;
 	DATA_BLOB DataEnt;
@@ -493,15 +489,11 @@ bool RsLoginHandler::enableAutoLogin(const std::string& ssl_id,const std::string
 		  std::cerr << std::endl;
 		 **********/
 
-		/* save the data to the file */
-		std::string passwdfile = RsInitConfig::configDir;
-		passwdfile += RsInitConfig::dirSeperator  + configKeyDir + RsInitConfig::dirSeperator;
-		passwdfile += "help.dta";
-
 		//std::cerr << "Save to: " << passwdfile;
 		//std::cerr << std::endl;
 
-		FILE *fp = fopen(passwdfile.c_str(), "wb");
+		/* save the data to the file */
+		FILE *fp = fopen(getAutologinFileName(ssl_id).c_str(), "wb");
 		if (fp != NULL)
 		{
 			fwrite(DataOut.pbData, 1, DataOut.cbData, fp);
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index cf580af06..5b2cc2ddf 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -211,9 +211,9 @@ void StartDialog::notSecureWarning() {
 	/* some error msg */
 		if(ui.autologin_checkbox->isChecked())
 #ifdef UBUNTU
-				QMessageBox::warning ( this, tr("Warning"), tr(" The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
+				QMessageBox::warning ( this, tr("Warning"), tr("The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
 #else
-				QMessageBox::warning ( this, tr("Warning"), tr(" The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
+				QMessageBox::warning ( this, tr("Warning"), tr("The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
 #endif
 
 		return;
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index aba77a6a3..0ba0fd737 100644
Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ
diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index e9165465c..d890f79b9 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -10473,25 +10473,33 @@ Bist Du sicher?</translation>
         <location line="+30"/>
         <location line="+2"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung</translation>
     </message>
     <message>
         <location line="-2"/>
-        <source> The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. 
+        <source>The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. 
 
  Your PGP passwd will not be stored.
 
 This choice can be reverted in settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in deinem Gnome Keyring gespeichert.
+
+Dein PGP wird nicht gespeichert.
+
+Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source> The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. 
+        <source>The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. 
 
  Your PGP passwd will not be stored.
 
 This choice can be reverted in settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in der Datei keys/help.dta gespeichert- Das ist nicht sicher.
+
+Dein PGP wird nicht gespeichert.
+
+Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
     </message>
 </context>
 <context>