Update CE to check email address before sending notifications