diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
index 1f146ab06..0344ba7c1 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
@@ -218,22 +218,6 @@ namespace Barotrauma
             return true;
         }
 
-        private bool RefreshJoinButtonState(GUIComponent component, object obj)
-        {
-            if (obj == null || waitingForRefresh) { return false; }
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text) && !string.IsNullOrWhiteSpace(ipBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
-            else
-            {
-                joinButton.Enabled = false;
-            }
-
-            return true;
-        }
-
         private bool SelectServer(GUIComponent component, object obj)
         {
             if (obj == null || waitingForRefresh) { return false; }
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs
index df7a431fa..49827886d 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs
@@ -83,11 +83,15 @@ namespace Barotrauma
             Commonness  = element.GetAttributeInt("commonness", 1);
 
             SuccessMessage  = TextManager.Get("MissionSuccess." + Identifier, true) ?? element.GetAttributeString("successmessage", "Mission completed successfully");
-            FailureMessage  = 
-                TextManager.Get("MissionFailure." + Identifier, true) ?? 
-                element.GetAttributeString("failuremessage", null) ??
-                TextManager.Get("missionfailed", returnNull: true) ??
-                "";
+            FailureMessage  = TextManager.Get("MissionFailure." + Identifier, true) ?? "";
+            if (string.IsNullOrEmpty(FailureMessage) && TextManager.ContainsTag("missionfailed"))
+            {
+                FailureMessage = TextManager.Get("missionfailed", returnNull: true) ?? "";
+            }
+            if (string.IsNullOrEmpty(FailureMessage) && GameMain.Config.Language == "English")
+            {
+                FailureMessage = element.GetAttributeString("failuremessage", "");
+            }
 
             SonarLabel      = TextManager.Get("MissionSonarLabel." + Identifier, true) ?? element.GetAttributeString("sonarlabel", "");