Fix for custom user model