Fix email name bugs.