diff --git a/common/djangoapps/track/views/__init__.py b/common/djangoapps/track/views/__init__.py
index c5241b23fb..140afbd0e6 100644
--- a/common/djangoapps/track/views/__init__.py
+++ b/common/djangoapps/track/views/__init__.py
@@ -102,13 +102,12 @@ def user_track(request):
     #  Remove it after the experiment has been paused.
     if (
         name == 'edx.course.home.resume_course.clicked' and
-        data.get('from_email') and
         data.get('event_type') == 'start' and
         request.user
     ):
         optimizely_client = OptimizelyClient.get_optimizely_client()
         if optimizely_client:
-            optimizely_client.track('user_start_course_click', str(request.user.id))
+            optimizely_client.track('course_started', str(request.user.id))
 
     return HttpResponse('success')
 
diff --git a/lms/djangoapps/course_home_api/outline/views.py b/lms/djangoapps/course_home_api/outline/views.py
index dc8b0fe31d..9d9e4e1cd1 100644
--- a/lms/djangoapps/course_home_api/outline/views.py
+++ b/lms/djangoapps/course_home_api/outline/views.py
@@ -395,7 +395,7 @@ def save_course_goal(request):  # pylint: disable=missing-function-docstring
         #  Remove it after the experiment has been paused.
         optimizely_client = OptimizelyClient.get_optimizely_client()
         if optimizely_client and request.user:
-            optimizely_client.track('user_goal_setting_click', str(request.user.id))
+            optimizely_client.track('goal_set', str(request.user.id))
         return Response({
             'header': _('Your course goal has been successfully set.'),
             'message': _('Course goal updated successfully.'),