Index: source/ps/GameSetup/Config.cpp
===================================================================
--- source/ps/GameSetup/Config.cpp
+++ source/ps/GameSetup/Config.cpp
@@ -25,6 +25,7 @@
 #include "ps/ConfigDB.h"
 #include "ps/GameSetup/CmdLineArgs.h"
 
+extern const char* engine_version;
 // (these variables are documented in the header.)
 
 const wchar_t g_DefaultCursor[] = L"default-arrow";
@@ -121,7 +122,6 @@
 		g_ConfigDB.SetValueString(CFG_COMMAND, "rejointest", args.Get("rejointest"));
 }
 
-
 void CONFIG_Init(const CmdLineArgs& args)
 {
 	TIMER(L"CONFIG_Init");
@@ -137,7 +137,9 @@
 	g_ConfigDB.SetConfigFile(CFG_SYSTEM, L"config/local.cfg");
 	g_ConfigDB.Reload(CFG_SYSTEM);
 
-	g_ConfigDB.SetConfigFile(CFG_USER, L"config/user.cfg");
+	std::string pathString("config/");
+	pathString.append(engine_version).append("/user.cfg");
+	g_ConfigDB.SetConfigFile(CFG_USER, pathString);
 	g_ConfigDB.Reload(CFG_USER);
 
 	g_ConfigDB.SetConfigFile(CFG_MOD, L"config/mod.cfg");