diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs
index ce9e911a..895e10b5 100644
--- a/TShockAPI/DB/GroupManager.cs
+++ b/TShockAPI/DB/GroupManager.cs
@@ -160,6 +160,11 @@ namespace TShockAPI.DB
             groups = new List<Group>();
             groups.Add(new SuperAdminGroup());
 
+            if (TShock.Users == null)
+            {
+                TShock.Users = new UserManager(TShock.DB);
+            }
+
             try
             {
                 using (var com = database.CreateCommand())
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 17c36c7d..88aedaef 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -171,9 +171,9 @@ namespace TShockAPI
             Bans = new BanManager(DB);
             Warps = new WarpManager(DB);
             Regions = new RegionManager(DB);
+            Users = new UserManager(DB);
             Groups = new GroupManager(DB);
             Groups.LoadPermisions();
-            Users = new UserManager(DB);
             Itembans = new ItemManager(DB);
 
             Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename));