Updated to url encode email parameters