email notifications complete fix #2