Changes to handle configuration email addresses