Move out of conditional so we can use orig_email in error case also