diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
index fda6adfb3..092e188d8 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
@@ -198,6 +198,10 @@ namespace Barotrauma
                     UserData = "noresults"
                 };
             }
+            else
+            {
+                joinButton.Enabled = false;
+            }
 
             return true;
         }
@@ -232,78 +236,6 @@ namespace Barotrauma
                 joinButton.Enabled = 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; }
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
-            else
-            {
-                clientNameBox.Flash();
-                joinButton.Enabled = 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; }
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
-            else
-            {
-                clientNameBox.Flash();
-                joinButton.Enabled = false;
-            }
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
-            else
-            {
-                clientNameBox.Flash();
-                joinButton.Enabled = false;
-            }
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
-            else
-            {
-                clientNameBox.Flash();
-                joinButton.Enabled = false;
-            }
-
             ServerInfo serverInfo;
             try
             {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs
index 2d7c53b13..371adce79 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs
@@ -192,13 +192,6 @@ namespace Barotrauma
 
             if (dist > maxDistance) return Vector2.Zero;
 
-            if (!avoidObstaclePos.HasValue) return Vector2.Zero;
-
-            Vector2 diff = avoidObstaclePos.Value - host.SimPosition;
-            float dist = diff.Length();
-
-            if (dist > maxDistance) return Vector2.Zero;
-
             return -diff * (1.0f - dist / maxDistance) * weight;
         }
 
diff --git a/Barotrauma/BarotraumaShared/Source/GameSettings.cs b/Barotrauma/BarotraumaShared/Source/GameSettings.cs
index 6e29c55bd..562989979 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSettings.cs
@@ -473,6 +473,16 @@ namespace Barotrauma
 
             QuickStartSubmarineName = doc.Root.GetAttributeString("quickstartsub", "");
 
+            MasterServerUrl = doc.Root.GetAttributeString("masterserverurl", "");
+
+            AutoCheckUpdates = doc.Root.GetAttributeBool("autocheckupdates", true);
+            WasGameUpdated = doc.Root.GetAttributeBool("wasgameupdated", false);
+
+            VerboseLogging = doc.Root.GetAttributeBool("verboselogging", false);
+            SaveDebugConsoleLogs = doc.Root.GetAttributeBool("savedebugconsolelogs", false);
+
+            QuickStartSubmarineName = doc.Root.GetAttributeString("quickstartsub", "");
+
             if (doc == null)
             {
                 GraphicsWidth = 1024;
@@ -924,6 +934,55 @@ namespace Barotrauma
 
             selectedContentPackagePaths = new HashSet<string>();
 
+            foreach (XElement subElement in doc.Root.Elements())
+            {
+                switch (subElement.Name.ToString().ToLowerInvariant())
+                {
+                    case "keymapping":
+                        LoadKeyBinds(subElement);
+                        break;
+                    case "gameplay":
+                        jobPreferences = new List<string>();
+                        foreach (XElement ele in subElement.Element("jobpreferences").Elements("job"))
+                        {
+                            string jobIdentifier = ele.GetAttributeString("identifier", "");
+                            if (string.IsNullOrEmpty(jobIdentifier)) continue;
+                            jobPreferences.Add(jobIdentifier);
+                        }
+                        break;
+                    case "player":
+                        defaultPlayerName = subElement.GetAttributeString("name", defaultPlayerName);
+                        CharacterHeadIndex = subElement.GetAttributeInt("headindex", CharacterHeadIndex);
+                        if (Enum.TryParse(subElement.GetAttributeString("gender", "none"), true, out Gender g))
+                        {
+                            CharacterGender = g;
+                        }
+                        if (Enum.TryParse(subElement.GetAttributeString("race", "white"), true, out Race r))
+                        {
+                            CharacterRace = r;
+                        }
+                        else
+                        {
+                            CharacterRace = Race.White;
+                        }
+                        CharacterHairIndex = subElement.GetAttributeInt("hairindex", CharacterHairIndex);
+                        CharacterBeardIndex = subElement.GetAttributeInt("beardindex", CharacterBeardIndex);
+                        CharacterMoustacheIndex = subElement.GetAttributeInt("moustacheindex", CharacterMoustacheIndex);
+                        CharacterFaceAttachmentIndex = subElement.GetAttributeInt("faceattachmentindex", CharacterFaceAttachmentIndex);
+                        break;
+                    case "tutorials":
+                        foreach (XElement tutorialElement in subElement.Elements())
+                        {
+                            CompletedTutorialNames.Add(tutorialElement.GetAttributeString("name", ""));
+                        }
+                        break;
+                }
+            }
+
+            UnsavedSettings = false;
+
+            selectedContentPackagePaths = new HashSet<string>();
+
             foreach (XElement subElement in doc.Root.Elements())
             {
                 gSettings = new XElement("graphicssettings");