Fix for service provider emails