2nd email code put in without whitespace changes (which went unexpectedly in the previous commit)