Fixes server issues with emailing - mrracine