diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 6758d440a..055260673 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -903,16 +903,76 @@ void CClientConfig::setValues()
 	READ_STRING_FV(FSHost)
 
 	READ_BOOL_DEV(DisplayAccountButtons)
-	READ_STRING_DEV(CreateAccountURL)
-	READ_STRING_DEV(EditAccountURL)
-	READ_STRING_DEV(ForgetPwdURL)
+	
+	
+	READ_STRING_FV(CreateAccountURL)
+	READ_STRING_FV(EditAccountURL)
+	READ_STRING_FV(ForgetPwdURL)
+	
 	READ_STRING_DEV(BetaAccountURL)
 	READ_STRING_DEV(FreeTrialURL)
 
 	// defined in client_default.cfg
-	READ_STRING_FV(ConditionsTermsURL)
-	READ_STRING_FV(NamingPolicyURL)
 	READ_STRING_FV(LoginSupportURL)
+	
+	// read NamingPolicyURL from client_default.cfg
+	//READ_STRING_FV(NamingPolicyURL)
+	
+	std::string languageCo = "wk";
+	CConfigFile::CVar *languageCodeVarPtr = ClientCfg.ConfigFile.getVarPtr("LanguageCode");
+
+	if (languageCodeVarPtr)
+	{
+		languageCo = languageCodeVarPtr->asString();
+	}
+
+	CConfigFile::CVar *policyurl = ClientCfg.ConfigFile.getVarPtr("NamingPolicyURL");
+
+	if (policyurl)
+	{
+		for (uint i = 0; i < policyurl->size(); ++i)
+		{
+			std::string entry = policyurl->asString(i);
+			if (entry.size() >= languageCo.size())
+			{
+				if (nlstricmp(entry.substr(0, languageCo.size()), languageCo) == 0)
+				{
+					std::string::size_type pos = entry.find("=");
+
+					if (pos != std::string::npos)
+					{
+						ClientCfg.NamingPolicyURL = entry.substr(pos + 1);
+					}
+				}
+			}
+		}
+	}
+	
+	// read NamingPolicyURL from client_default.cfg
+	//READ_STRING_FV(ConditionsTermsURL)
+	CConfigFile::CVar *coturl = ClientCfg.ConfigFile.getVarPtr("ConditionsTermsURL");
+
+	if (coturl)
+	{
+		for (uint i = 0; i < coturl->size(); ++i)
+		{
+			std::string entry = coturl->asString(i);
+			
+			if (entry.size() >= languageCo.size())
+			{
+				if (nlstricmp(entry.substr(0, languageCo.size()), languageCo) == 0)
+				{
+					std::string::size_type pos = entry.find("=");
+
+					if (pos != std::string::npos)
+					{
+						ClientCfg.ConditionsTermsURL = entry.substr(pos + 1);
+					}
+				}
+			}
+		}
+	}
+	
 
 #ifndef RZ_NO_CLIENT
 	// if cookie is not empty, it means that the client was launch
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index 674b92397..244bb593c 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -1932,8 +1932,11 @@ class CAHOpenURL : public IActionHandler
 #else
 		// TODO: for Linux and Mac OS
 #endif
-
-		if (sParams == "cfg_EditAccountURL")
+		if (sParams == "cfg_CreateAccountURL")
+		{
+			url = ClientCfg.CreateAccountURL;
+		}
+		else if (sParams == "cfg_EditAccountURL")
 		{
 			url = ClientCfg.EditAccountURL;
 		}
@@ -1971,32 +1974,35 @@ class CAHOpenURL : public IActionHandler
 			nlwarning("no URL found");
 			return;
 		}
+		
+		if(sParams != "cfg_ConditionsTermsURL" && sParams != "cfg_NamingPolicyURL")
+		{
+			// modify existing languages
 
-		// modify existing languages
-
-		// old site
-		string::size_type pos_lang = url.find("/en/");
+			// old site
+			string::size_type pos_lang = url.find("/en/");
 
-		// or new forums
-		if (pos_lang == string::npos)
-			pos_lang = url.find("=en#");
+			// or new forums
+			if (pos_lang == string::npos)
+				pos_lang = url.find("=en#");
 
-		if (pos_lang != string::npos)
-		{
-			url.replace(pos_lang + 1, 2, ClientCfg.getHtmlLanguageCode());
-		}
-		else
-		{
-			// append language
-			if (url.find('?') != string::npos)
-				url += "&";
+			if (pos_lang != string::npos)
+			{
+				url.replace(pos_lang + 1, 2, ClientCfg.getHtmlLanguageCode());
+			}
 			else
-				url += "?";
+			{
+				// append language
+				if (url.find('?') != string::npos)
+					url += "&";
+				else
+					url += "?";
 
-			url += "language=" + ClientCfg.LanguageCode;
+				url += "language=" + ClientCfg.LanguageCode;
 
-			if (!LoginCustomParameters.empty())
-				url += LoginCustomParameters;
+				if (!LoginCustomParameters.empty())
+					url += LoginCustomParameters;
+			}
 		}
 
 		openURL(url);