Adjustments to email notification logic