#953 - Investigate double email notices