Bug 1087184, second part of fix, to allow for undefined emailAddress

Reated to 3c1668ad793d4f1a40831c46638acef38e0db230