Fix client email encoding

r? @warner or @dannycoates