diff --git a/Changelog.txt b/Changelog.txt
index fb48a4cd8..3ed3459bc 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -16,6 +16,7 @@ Version 1.4.00-dev
  + Added '/party disband' command, kicks out all members and deletes the party
  + Added '/ptp toggle' command, to disable party teleportation.
  + Added '/ptp accept' and '/ptp deny' commands
+ = Fixed Spout config files loading / generating when they shouldn't have
  = Fixed mod config files loading / generating when they shouldn't have
  = Fixed bug where Green Terra could activate on crops that weren't fully grown.
  = Fixed several typos relating to locale string display
diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
index faf7bc3c9..b11257743 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -26,7 +26,7 @@ public class PlayerProfile {
 
     /* HUD */
     private SpoutHud spoutHud;
-    private HudType hudType = SpoutConfig.getInstance().defaultHudType;
+    private HudType hudType;
 
     /* Party Stuff */
     private Party party;
@@ -67,6 +67,13 @@ public class PlayerProfile {
         this.playerName = playerName;
         party = PartyManager.getPlayerParty(playerName);
 
+        if (mcMMO.spoutEnabled) {
+            hudType = SpoutConfig.getInstance().defaultHudType;
+        }
+        else {
+            hudType = HudType.DISABLED;
+        }
+
         for (AbilityType abilityType : AbilityType.values()) {
             skillsDATS.put(abilityType, 0);
         }
@@ -464,7 +471,7 @@ public class PlayerProfile {
             out.append(0 + ":"); //DATS
             out.append(0 + ":"); //DATS
             out.append(0 + ":"); //DATS
-            out.append(SpoutConfig.getInstance().defaultHudType.toString() + ":");//HUD
+            out.append(hudType.toString() + ":");//HUD
             out.append(0 + ":"); //Fishing
             out.append(0 +":"); //FishingXP
             out.append(0 + ":"); //Blast Mining
diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
index a5dfbe957..2512b2756 100644
--- a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
+++ b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
@@ -37,7 +37,7 @@ public class SpoutStuff {
     public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator;
     public final static String soundDirectory = spoutDirectory + "Sound" + File.separator;
 
-    public static boolean showPowerLevel = SpoutConfig.getInstance().getShowPowerLevel();
+    public static boolean showPowerLevel;
 
     private final static SpoutListener spoutListener = new SpoutListener();
     public static Keyboard menuKey;
@@ -161,6 +161,7 @@ public class SpoutStuff {
      * Setup Spout config options
      */
     public static void setupSpoutConfigs() {
+        showPowerLevel = SpoutConfig.getInstance().getShowPowerLevel();
         String temp = SpoutConfig.getInstance().getMenuKey();
 
         for (Keyboard x : Keyboard.values()) {
diff --git a/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java b/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java
index 0e8b1287c..1f4f4c5a9 100644
--- a/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java
+++ b/src/main/java/com/gmail/nossr50/spout/commands/XplockCommand.java
@@ -27,7 +27,7 @@ public class XplockCommand implements CommandExecutor {
             return true;
         }
 
-        if (!mcMMO.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
+        if (!mcMMO.spoutEnabled || !Config.getInstance().getCommandXPLockEnabled() || !SpoutConfig.getInstance().getXPBarEnabled()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
             return true;
         }