Fix for custom User model