Email verification: Fixed bugs + added "Re-send"