More custom user model import fixes