Fix user model and email