Fixed email validation and changed before_save