diff --git a/src/citymania/cm_commands_gui.cpp b/src/citymania/cm_commands_gui.cpp
index 8a47d8d5fe..822b66c8f0 100644
--- a/src/citymania/cm_commands_gui.cpp
+++ b/src/citymania/cm_commands_gui.cpp
@@ -786,6 +786,8 @@ static const NWidgetPart _nested_login_window_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
 		NWidget(WWT_CAPTION, COLOUR_GREY), SetToolTip(CM_STR_LOGIN_WINDOW_CAPTION),
+		NWidget(WWT_SHADEBOX, COLOUR_GREY),
+		NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY), SetResize(1, 0),
@@ -839,7 +841,7 @@ static const NWidgetPart _nested_login_window_widgets[] = {
 };
 
 static WindowDesc _login_window_desc(
-	WDP_CENTER, {}, 0, 0,
+	WDP_CENTER, "cm_commands", 0, 0,
 	CM_WC_LOGIN_WINDOW, WC_NONE,
 	WindowDefaultFlag::Construction,
 	_nested_login_window_widgets
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index bfcd83696b..c0935405a7 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -2045,7 +2045,7 @@ static constexpr NWidgetPart _nested_build_depot_widgets[] = {
 };
 
 static WindowDesc _build_depot_desc(
-	WDP_AUTO, "cm_build_rail_depot", 0, 0,
+	WDP_AUTO, {}, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WindowDefaultFlag::Construction,
 	_nested_build_depot_widgets,