diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 374cff866..d2e3458fb 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -326,17 +326,8 @@ CClientConfig::CClientConfig()
 	Local				= false;					// Default is Net Mode.
 	FSHost				= "";						// Default Host.
 
-#if 1 // Yubo hack
-	// The order is important here, because in a layer, global texture are rendered through this order
-	TexturesInterface.push_back("texture_interfaces_v3");
-	// DXTC contain all items and bricks bitmaps, they must come after standard texture
-	TexturesInterface.push_back("new_texture_interfaces_dxtc");
-	// Added icons by Yubo's Team 2009
-	TexturesInterface.push_back("texture_extra");
-#else
 	TexturesInterface.push_back("texture_interfaces_v3");
 	TexturesInterfaceDXTC.push_back("texture_interfaces_dxtc");
-#endif
 
 	TexturesOutGameInterface.push_back("texture_interfaces_v3_outgame_ui");
 
@@ -1126,7 +1117,7 @@ void CClientConfig::setValues()
 		if (ClientCfg.getDefaultConfigLocation(defaultConfigFileName))
 			ClientCfg.CurlCABundle = CFile::getPath(defaultConfigFileName)+ClientCfg.CurlCABundle.substr(1);
 	}
-		
+
 	///////////////
 	// ANIMATION //
 	// AnimatedAngleThreshold
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index c9c1fdeaf..d3c0a629a 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -161,8 +161,10 @@ CLoginStateMachine LoginSM;
 
 bool CStartupHttpClient::connectToLogin()
 {
-	return connect(ClientCfg.ConfigFile.getVar("StartupHost").asString(0))
-		&& verifyServer(ClientCfg.ConfigFile.getVar("StartupVerify").asBool(0));
+	bool checkConnect = connect(ClientCfg.ConfigFile.getVar("StartupHost").asString(0));
+
+	if (ClientCfg.ConfigFile.exists("StartupVerify"))
+		checkConnect = checkConnect && verifyServer(ClientCfg.ConfigFile.getVar("StartupVerify").asBool(0));
 }
 
 CStartupHttpClient HttpClient;
@@ -1969,7 +1971,7 @@ class CAHOpenURL : public IActionHandler
 		}
 
 		// modify existing languages
-		
+
 		// old site
 		string::size_type pos_lang = url.find("/en/");