YH-238: Fixed email verification