Fixed bugs regarding email verification