Fixes email host in email addresses

(cherry-picked from commit 61c8022b153bade0a9b6319c1fef96454f834c1e)