Bug fix for email settings