diff --git a/src/net/clientthread.h b/src/net/clientthread.h
index 1003b657..468da139 100644
--- a/src/net/clientthread.h
+++ b/src/net/clientthread.h
@@ -41,12 +41,13 @@ class NetPacket;
 class AvatarManager;
 class Log;
 class QtToolsInterface;
+class ConfigFile;
 struct Gsasl;
 
 class ClientThread : public Thread, public boost::enable_shared_from_this<ClientThread>, public SessionDataCallback
 {
 public:
-	ClientThread(GuiInterface &gui, AvatarManager &avatarManager);
+	ClientThread(GuiInterface &gui, AvatarManager &avatarManager, ConfigFile *config);
 	virtual ~ClientThread();
 
 	// Set the parameters. Does not do any error checking.
diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
index 88dd00b8..9dd29e24 100644
--- a/src/net/common/clientthread.cpp
+++ b/src/net/common/clientthread.cpp
@@ -49,7 +49,7 @@
 using namespace std;
 using boost::asio::ip::tcp;
 
-ClientThread::ClientThread(GuiInterface &gui, AvatarManager &avatarManager)
+ClientThread::ClientThread(GuiInterface &gui, AvatarManager &avatarManager, ConfigFile *config)
 	: m_ioService(new boost::asio::io_service), m_curState(NULL), m_gui(gui),
 	  m_avatarManager(avatarManager), m_isServerSelected(false),
 	  m_curGameId(0), m_curGameNum(1), m_guiPlayerId(0), m_sessionEstablished(false),
diff --git a/src/session.cpp b/src/session.cpp
index fc499c73..29117e92 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -169,7 +169,7 @@ void Session::startInternetClient()
 	}
 	myGameType = GAME_TYPE_INTERNET;
 
-	myNetClient.reset(new ClientThread(*myGui, *myAvatarManager));
+	myNetClient.reset(new ClientThread(*myGui, *myAvatarManager, myConfig));
 	bool useAvatarServer = myConfig->readConfigInt("UseAvatarServer") != 0;
 
 	myNetClient->Init(
@@ -194,7 +194,7 @@ void Session::startNetworkClient(const string &serverAddress, unsigned serverPor
 	}
 	myGameType = GAME_TYPE_NETWORK;
 
-	myNetClient.reset(new ClientThread(*myGui, *myAvatarManager));
+	myNetClient.reset(new ClientThread(*myGui, *myAvatarManager, myConfig));
 	myNetClient->Init(
 		serverAddress,
 		"",
@@ -221,7 +221,7 @@ void Session::startNetworkClientForLocalServer(const GameData &gameData)
 	}
 	myGameType = GAME_TYPE_NETWORK;
 
-	myNetClient.reset(new ClientThread(*myGui, *myAvatarManager));
+	myNetClient.reset(new ClientThread(*myGui, *myAvatarManager, myConfig));
 	bool useIpv6 = myConfig->readConfigInt("ServerUseIpv6") == 1;
 	const char *loopbackAddr = useIpv6 ? "::1" : "127.0.0.1";
 	myNetClient->Init(