Email notification related changes