WCP-318 : Fix email being used by Madison Portal