Combine settings for email and email notification settings. Closes #289