fix last pull request merges and refactor email defaults