Goals emails logic frontend fixed