diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index 8fb57e2f1..288cbcd30 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -241,26 +241,6 @@ namespace Barotrauma
             }
 #endif
             displayModeDD.OnSelected = (guiComponent, obj) =>
-            {
-                ToolTip = TextManager.Get("EnableVSyncToolTip"),
-                OnSelected = (GUITickBox box) =>
-                {
-                    VSyncEnabled = box.Selected;
-                    GameMain.GraphicsDeviceManager.SynchronizeWithVerticalRetrace = VSyncEnabled;
-                    GameMain.GraphicsDeviceManager.ApplyChanges();
-                    UnsavedSettings = true;
-
-                    return true;
-                },
-                Selected = VSyncEnabled
-            };
-
-            //TODO: remove hardcoded texts after the texts have been added to localization
-            GUITickBox pauseOnFocusLostBox = new GUITickBox(new RectTransform(new Point(32, 32), leftColumn.RectTransform), 
-                TextManager.Get("PauseOnFocusLost", returnNull: true) ?? "Pause on focus lost");
-            pauseOnFocusLostBox.Selected = PauseOnFocusLost;
-            pauseOnFocusLostBox.ToolTip = TextManager.Get("PauseOnFocusLostToolTip", returnNull: true) ?? "Pauses the game when its window is not in focus. Note that the game won't be paused when a multiplayer session is active.";
-            pauseOnFocusLostBox.OnSelected = (tickBox) =>
             {
                 PauseOnFocusLost = tickBox.Selected;
                 UnsavedSettings = true;
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
index a431c7354..50a985292 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
@@ -217,6 +217,22 @@ 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 || (!(obj is ServerInfo))) { return false; }
@@ -557,10 +573,6 @@ namespace Barotrauma
                         new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"), 
                             TextManager.Get("MasterServerErrorUnavailable"));
                         break;
-                    case System.Net.HttpStatusCode.ServiceUnavailable:
-                        new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"), 
-                            TextManager.Get("MasterServerErrorUnavailable"));
-                        break;
                     default:
                         new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"),
                             TextManager.GetWithVariables("MasterServerErrorDefault", new string[2] { "[statuscode]", "[statusdescription]" }, 
diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt
index 66313a114..745a25aea 100644
--- a/Barotrauma/BarotraumaShared/changelog.txt
+++ b/Barotrauma/BarotraumaShared/changelog.txt
@@ -1,3 +1,35 @@
+---------------------------------------------------------------------------------------------------------
+v0.9.0.4
+---------------------------------------------------------------------------------------------------------
+
+- Fixed "Steam authentication failed" errors when trying to reconnect to a server after cancelling the
+connection.
+- Fixed clients occasionally failing to spawn items when playing using a different language than the server,
+which caused them to get kicked.
+- Fixed extra cargo failing to spawn in multiplayer when playing using a different language than the server. 
+- Fixed legacy items failing to load if a sub is saved with a language other than English and the language 
+then changed to something else.
+- Fixed excessively small password input box when connecting to servers.
+- Fixed a bug that occasionally caused items to drop from the inventory when moving items between 
+inventory slots in the multiplayer.
+- Prevent junction boxes from getting damaged due to overvoltage in the engineering tutorial.
+- Fixed structures getting scaled incorrectly when cloning a structure with a non-default scale in the 
+submarine editor.
+- Fixed occasional crashes when leaving a multiplayer session while the "cinematic" at the end of the round
+is still playing.
+- Fixed items not being moved to the humanhusk's inventory when a huskified player dies (= clothes and
+other gear seemed to magically disappear when the character "resurrected" as an AI husk).
+- Fixed clients not seeing turrets rotating at their end when another client is operating the turret.
+- Fixed hitscan projectiles (revolver rounds) going through walls if the weapon is fired while its 
+barrel is partially inside the wall.
+- Fixed welding tools being able to weld doors and burn characters through walls.
+- Fixed bots reporting leaks when there are holes in the interior walls.
+- Fixes to the colliders of some of the shuttle wall pieces.
+- Fixed Linux version crashing when attempting to browse for files in the Steam Workshop menu.
+- Fixed credits not resizing when resolution is changed.
+- Added an upper limit to impact damage done to ragdolls, preventing characters from getting instakilled if
+a Moloch or another large monster smashes against the sub hard enough.
+
 ---------------------------------------------------------------------------------------------------------
 v0.9.0.3
 ---------------------------------------------------------------------------------------------------------