Fix mail logic, change argument on userscontroller