Email configuration changes

Email configuration changes.