Changed email notification mechanism