Force email addr rewrite (#389,#390,#391)