Merge pull request #16078 from ja-pa/fix-email