Email Configuration fix