Fixed Email Issue