Added some changes to email config