diff --git a/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs
index d62973fd77..4e39ba2105 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs
@@ -106,6 +106,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var connectionError = widget.Get<LabelWidget>("CONNECTION_ERROR");
 			connectionError.GetText = () => orderManager.ServerError;
 
+			var panelTitle = widget.Get<LabelWidget>("TITLE");
+			panelTitle.GetText = () => orderManager.AuthenticationFailed ? "Password Required" : "Connection Failed";
+
 			passwordField = panel.GetOrNull<PasswordFieldWidget>("PASSWORD");
 			if (passwordField != null)
 			{
diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml
index a458855fa1..1ef3c5f73b 100644
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -45,7 +45,6 @@ Container@CONNECTIONFAILED_PANEL:
 			Font: BigBold
 			Contrast: true
 			Align: Center
-			Text: Connection Failed
 		Background@CONNECTION_BACKGROUND:
 			Width: 370
 			Height: 85
diff --git a/mods/ra/chrome/connection.yaml b/mods/ra/chrome/connection.yaml
index ac333084c7..ddebd34792 100644
--- a/mods/ra/chrome/connection.yaml
+++ b/mods/ra/chrome/connection.yaml
@@ -6,12 +6,11 @@ Background@CONNECTIONFAILED_PANEL:
 	Height: 160
 	Children:
 		LogicTicker@CONNECTION_FAILED_TICKER:
-		Label@CONNECTION_FAILED_TITLE:
+		Label@TITLE:
 			X: 0
 			Y: 20
 			Width: 450
 			Height: 25
-			Text: Connection Failed
 			Align: Center
 			Font: Bold
 		Label@CONNECTING_DESC:
@@ -43,7 +42,7 @@ Background@CONNECTIONFAILED_PANEL:
 			MaxLength: 20
 			Height: 25
 		Button@RETRY_BUTTON:
-			X: PARENT_RIGHT - 360
+			X: PARENT_RIGHT - 430
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25