Fix support for custom user models