Fixes for email provider