Goals emails logic adjusted