Fixed two problems with new email notifications