Minor changes to order of if statements in email verification