Added a second step check to the user model and to some validations