Remove empty email field
(cherry-picked from a456214)
Merge commit '3a23fc6e'