diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index da8a69c8..307bec19 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -294,6 +294,9 @@ void ConfigFile::updateConfig(CONFIGSTATE myConfigState) {
 		doc.SaveFile( configFileName );
 
 	}
+
+	if(myConfigState == old) {
+	}
 	
 	delete myQtToolsInterface;
 	myQtToolsInterface = 0;
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index f4b356bb..8ad542b1 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -27,8 +27,11 @@ using namespace std;
 joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
       : QDialog(parent)
 {
+	bool toIntTrue;
+    	
+	setupUi(this);
 
-    setupUi(this);
+	spinBox_port->setValue(QString::fromUtf8(myConfig.readConfigString("ServerPort").c_str()).toInt(&toIntTrue, 10));
 
 	//Profile Name darf nicht mit einer Zahl beginnen --> XML konform
 	QRegExp rx("[A-Z|a-z]+[A-Z|a-z|\\d]*");
diff --git a/src/gui/qt/waitforservertostartgamedialog.ui b/src/gui/qt/waitforservertostartgamedialog.ui
index ba5e4832..612f5d10 100644
--- a/src/gui/qt/waitforservertostartgamedialog.ui
+++ b/src/gui/qt/waitforservertostartgamedialog.ui
@@ -80,5 +80,22 @@
   </layout>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>pushButton_cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>waitForServerToStartGameDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>162</x>
+     <y>231</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>64</x>
+     <y>233</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>