diff --git a/Mage.Client/config/config.properties b/Mage.Client/config/config.properties
new file mode 100644
index 00000000000..7c8e6bc7d45
--- /dev/null
+++ b/Mage.Client/config/config.properties
@@ -0,0 +1,6 @@
+server-name=localhost
+port=17171
+remote-server=mage-server
+cards-resource-path=resources/images/cards/
+symbols-resource-path=resources/images/symbols/
+resource-path=resources/images/
\ No newline at end of file
diff --git a/Mage.Client/src/mage/client/TablesPanel.java b/Mage.Client/src/mage/client/TablesPanel.java
index a228337b646..9b140fd5569 100644
--- a/Mage.Client/src/mage/client/TablesPanel.java
+++ b/Mage.Client/src/mage/client/TablesPanel.java
@@ -87,6 +87,7 @@ public class TablesPanel extends javax.swing.JPanel implements Observer {
 
 		Action join = new AbstractAction()
 		{
+			@Override
 			public void actionPerformed(ActionEvent e)
 			{
 				int modelRow = Integer.valueOf( e.getActionCommand() );
@@ -128,6 +129,7 @@ public class TablesPanel extends javax.swing.JPanel implements Observer {
 
 		this.roomId = roomId;
 		session = MageFrame.getSession();
+		this.btnQuickStart.setVisible(false);
 		if (newTableDialog == null) {
 			newTableDialog = new NewTableDialog();
 			MageFrame.getDesktop().add(newTableDialog);