diff --git a/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
index 8492ac34e..743b4b6b6 100644
--- a/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
@@ -23,6 +23,7 @@ public class MmoupdateCommand implements CommandExecutor {
         switch (args.length) {
             case 0:
                 sender.sendMessage(LocaleLoader.getString("Commands.mmoupdate.Start"));
+                UserManager.saveAll();
                 UserManager.clearAll();
                 convertToMySQL();
 
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index ab47c9d1f..9f99bbfdc 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -166,11 +166,12 @@ public class mcMMO extends JavaPlugin {
     @Override
     public void onDisable() {
         try {
-            reloadDisableHelper(); // Prevent Berserk from getting "stuck"
-            UserManager.saveAll(); // Make sure to save player information if the server shuts down
-            PartyManager.saveParties();
-            placeStore.saveAll(); // Save our metadata
-            placeStore.cleanUp(); // Cleanup empty metadata stores
+            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
         }
         catch (NullPointerException e) {}