diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index be4de899..f02e16ec 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -36,7 +36,7 @@ class QtToolsWrapper;
 
 using namespace std;
 
-ConfigFile::ConfigFile()
+ConfigFile::ConfigFile(bool configFirstStart)
 {
 	// !!!! Revisionsnummer der Configdefaults !!!!!
 	configRev = 17;
@@ -72,49 +72,56 @@ ConfigFile::ConfigFile()
 			configFileName = curDir;
 		}
 	}
-	//Programmordner erstellen
+	//define app-dir
 	configFileName += "\\pokerth\\";
-	mkdir(configFileName.c_str());
-	//Log-File Ordner auch erstellen
+	////define log-dir
 	logDir = configFileName;
 	logDir += "log-files\\";
-	mkdir(logDir.c_str());
-	//data Ordner auch erstellen
+	////define data-dir
 	dataDir = configFileName;
 	dataDir += "data\\";
-	mkdir(dataDir.c_str());
+	//create directories on first start of app
+	if (configFirstStart) {
+		mkdir(configFileName.c_str());
+		mkdir(logDir.c_str());
+		mkdir(dataDir.c_str());
+	}
 	
 #else
-	//Programmordner erstellen
+	//define app-dir
 	const char *homePath = getenv("HOME");
 	if(homePath) {
 		configFileName = homePath;
 		configFileName += "/.pokerth/";
-		mkdir(configFileName.c_str(), MODUS) ;
-		//Log-File Ordner auch erstellen
+		////define log-dir
 		logDir = configFileName;
 		logDir += "log-files/";
-		mkdir(logDir.c_str(), MODUS);
-		//data Ordner auch erstellen
+		////define data-dir
 		dataDir = configFileName;
 		dataDir += "data/";
-		mkdir(dataDir.c_str(), MODUS);
+		//create directories on first start of app
+		if (configFirstStart) {
+			mkdir(configFileName.c_str(), MODUS) ;
+			mkdir(logDir.c_str(), MODUS);
+			mkdir(dataDir.c_str(), MODUS);
+		}
 	}
 #endif
 	configFileName += "config.xml";
-
-	//Prüfen ob Configfile existiert --> sonst anlegen
-	TiXmlDocument doc(configFileName); 
-	if(!doc.LoadFile()){ createDefaultConfig(); }
-	else { 
-	//Prüfen ob die Revision stimmt ansonsten löschen und neue anlegen 
-		int temp = 0;
-		TiXmlHandle docHandle( &doc );		
-		TiXmlElement* conf = docHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( "ConfigRevision" ).ToElement();
-		if ( conf ) { conf->QueryIntAttribute("value", &temp ); }
-		if (temp < configRev) { /*löschen()*/ createDefaultConfig() ;}
+	
+	if (configFirstStart) {
+		//Prüfen ob Configfile existiert --> sonst anlegen
+		TiXmlDocument doc(configFileName); 
+		if(!doc.LoadFile()){ createDefaultConfig(); }
+		else { 
+		//Prüfen ob die Revision stimmt ansonsten löschen und neue anlegen 
+			int temp = 0;
+			TiXmlHandle docHandle( &doc );		
+			TiXmlElement* conf = docHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( "ConfigRevision" ).ToElement();
+			if ( conf ) { conf->QueryIntAttribute("value", &temp ); }
+			if (temp < configRev) { /*löschen()*/ createDefaultConfig() ;}
+		}
 	}
-
 }
 
 
diff --git a/src/config/configfile.h b/src/config/configfile.h
index 134022b5..7c17f678 100644
--- a/src/config/configfile.h
+++ b/src/config/configfile.h
@@ -27,7 +27,7 @@
 
 class ConfigFile{
 public:
-    ConfigFile();
+    ConfigFile(bool configFirstStart =0);
 
     ~ConfigFile();
 
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index e60b6df6..3e61302b 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -28,8 +28,8 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent)
 
 	 setupUi(this);
 
-	stackedWidget->removeWidget(page_4);
-	listWidget->takeItem(2);
+// 	stackedWidget->removeWidget(page_4);
+// 	listWidget->takeItem(2);
 // 	page_4->hide();
 
 	playerNickIsChanged = FALSE;
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 341cee43..e21fc85a 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -30,6 +30,7 @@
 
 #include "session.h"
 #include "guiwrapper.h"
+#include "configfile.h"
 #include <net/socket_startup.h>
 
 #include <cstdlib>
@@ -59,6 +60,10 @@ class GuiWrapper;
 
 int main( int argc, char **argv )
 {
+	//create defaultconfig
+	bool configFirstStart = 1;
+	ConfigFile myConfig(configFirstStart);
+
 	//ENABLE_LEAK_CHECK();
 
 	//_CrtSetBreakAlloc(49937);
diff --git a/src/session.cpp b/src/session.cpp
index ca239a3a..5c6743e6 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -32,6 +32,7 @@ using namespace std;
 Session::Session(GuiInterface *g)
 : currentGameID(0), myNetClient(0), myNetServer(0), actualGame(0), myGui(g)
 {	
+	
 	myConfig = new ConfigFile;
 }