Attempt to fix User circular dependency auto-loading