Minor changes to order of if statements in email verification
Minor changes to order of if statements in email verification