diff --git a/cm_changelog.txt b/cm_changelog.txt
index 723aba7341..b15965944d 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -74,6 +74,9 @@ This is usable for any OpenTTD servers
 
 == CHANGELOG ==
 
+*** 1.6.1-2 (29 Jul 2016) ***
+- Fixed crash when joining ECS servers on windows
+
 *** 1.6.1 (24 Jul 2016) ***
 - Minor bugfixes
 
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index f1749d79cc..858e3d8482 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -363,7 +363,8 @@ public:
 		this->SetWidgetDisabledState(WID_TV_CHANGE_NAME, _networking && !_network_server);
 		// extern bool _novahost;
 		// this->wcb_disable = !_networking || !_novahost || this->town->larger_town || _game_mode == GM_EDITOR;
-		// this->SetWidgetDisabledState(WID_TV_CB, this->wcb_disable);
+		// this->wcb_disable = (_game_mode == GM_EDITOR);
+		this->SetWidgetDisabledState(WID_TV_CB, _game_mode == GM_EDITOR);
 	}
 
 	virtual void SetStringParameters(int widget) const