fix for custom User model and admin performance fix