email notification fixes