diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index f6a880da..325b4cad 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -48,7 +48,10 @@ ConfigFile::ConfigFile()
 		logDir = configFileName;
 		logDir += "log-files\\";
 		mkdir(logDir.c_str());
-		
+		//data Ordner auch erstellen
+		dataDir = configFileName;
+		dataDir += "data\\";
+		mkdir(dataDir.c_str());
 	}
 #else
 	//Programmordner erstellen
@@ -61,6 +64,10 @@ ConfigFile::ConfigFile()
 		logDir = configFileName;
 		logDir += "log-files/";
 		mkdir(logDir.c_str(), MODUS);
+		//data Ordner auch erstellen
+		dataDir = configFileName;
+		dataDir += "data/";
+		mkdir(dataDir.c_str(), MODUS);
 	}
 #endif
 	configFileName += "config.xml";
@@ -196,6 +203,10 @@ void ConfigFile::createDefaultConfig() {
 		TiXmlElement * confElement21 = new TiXmlElement( "LogStoreDuration" );
 		config->LinkEndChild( confElement21 );
       		confElement21->SetAttribute("value", 2);
+
+		TiXmlElement * confElement31 = new TiXmlElement( "DataDir" );
+		config->LinkEndChild( confElement30 );
+      		confElement30->SetAttribute("value", dataDir);
 		
 		doc.SaveFile( configFileName );
 
diff --git a/src/config/configfile.h b/src/config/configfile.h
index 8bd9e935..79f948a6 100644
--- a/src/config/configfile.h
+++ b/src/config/configfile.h
@@ -41,6 +41,7 @@ public:
 private:
 	std::string configFileName;
 	std::string logDir;
+	std::string dataDir;
 	int configRev;
 	
 };
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index b1a9ac43..d79cffc7 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "joinnetworkgamedialogimpl.h"
 #include "session.h"
-// #include "configfile.h"
+#include "configfile.h"
 
 joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
       : QDialog(parent)
@@ -29,6 +29,7 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
 
 	lineEdit_ipAddress->setFocus();
 
+	myConfig = new ConfigFile;
 
 // 	QShortcut *connectKey = new QShortcut(QKeySequence(Qt::Key_Enter), this);
 // 	connect( connectKey, SIGNAL(activated() ), pushButton_connect, SLOT( click() ) );
@@ -46,7 +47,23 @@ void joinNetworkGameDialogImpl::startClient() {
 
 void joinNetworkGameDialogImpl::saveServerProfile() {
 
-	// TODO: Check input values!
+	//Anlegen!
+	TiXmlDocument doc;  
+	TiXmlDeclaration * decl = new TiXmlDeclaration( "1.0", "UTF-8", ""); 
+	doc.LinkEndChild( decl );  
+	
+	TiXmlElement * root = new TiXmlElement( "PokerTH" );  
+	doc.LinkEndChild( root );  		
+	
+	TiXmlElement * config;
+       	config = new TiXmlElement( "ServerProfiles" );  
+	root->LinkEndChild( config );  
+		
+	TiXmlElement * confElement11 = new TiXmlElement( "ShowLeftToolBox" );
+	config->LinkEndChild( confElement11 );
+      	confElement11->SetAttribute("value", 1);
+		
+	doc.SaveFile( myConfig->readConfigString("dataDir")+"" );
 }
 
 void joinNetworkGameDialogImpl::deleteServerProfile() {
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
index 4c5c5d3b..16543970 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
@@ -33,6 +33,8 @@ Q_OBJECT
 public:
     joinNetworkGameDialogImpl(QWidget *parent = 0);
 
+	ConfigFile *myConfig;
+
 public slots:
 
 	void startClient();