diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 6ed786522..dcfe4a1ae 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -167,7 +167,6 @@ public class mcMMO extends JavaPlugin {
         try {
             reloadDisableHelper();      // Prevent Berserk from getting "stuck"
             UserManager.saveAll();      // Make sure to save player information if the server shuts down
-            UserManager.clearAll();     // Should always clear after saving
             PartyManager.saveParties(); // Save our parties
             placeStore.saveAll();       // Save our metadata
             placeStore.cleanUp();       // Cleanup empty metadata stores
diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
index 9fa193a62..882998b6b 100644
--- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java
+++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
@@ -13,7 +13,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 
 public final class UserManager {
-    private static Map<String, McMMOPlayer> players = new HashMap<String, McMMOPlayer>();
+    private final static Map<String, McMMOPlayer> players = new HashMap<String, McMMOPlayer>();
 
     private UserManager() {};