diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug
index 032b535026..bafb855ff7 100644
--- a/services/web/app/views/subscriptions/plans.pug
+++ b/services/web/app/views/subscriptions/plans.pug
@@ -167,7 +167,7 @@ block content
 													br
 													a.btn.btn-info(
 														ng-href="/user/subscription/new?planCode=student{{ plansVariant == 'default' ? planQueryString : '_'+plansVariant }}&currency={{currencyCode}}",
-														ng-click="signUpNowClicked('student')"
+														ng-click="signUpNowClicked('student-monthly')"
 													) #{translate("start_free_trial")}
 
 									.col-md-4
@@ -190,7 +190,7 @@ block content
 													br
 													a.btn.btn-info(
 														ng-href="/user/subscription/new?planCode=student-annual{{ plansVariant == 'default' ? '' : '_'+plansVariant }}&currency={{currencyCode}}",
-														ng-click="signUpNowClicked('student')"
+														ng-click="signUpNowClicked('student-annual')"
 													) #{translate("buy_now")}
 
 
diff --git a/services/web/public/coffee/main/account-settings.coffee b/services/web/public/coffee/main/account-settings.coffee
index 54cd8de1ea..82d323110e 100644
--- a/services/web/public/coffee/main/account-settings.coffee
+++ b/services/web/public/coffee/main/account-settings.coffee
@@ -1,7 +1,7 @@
 define [
 	"base"
 ], (App) ->
-	App.controller "AccountSettingsController", ["$scope", "$http", "$modal", ($scope, $http, $modal) ->
+	App.controller "AccountSettingsController", ["$scope", "$http", "$modal", "event_tracking", ($scope, $http, $modal, event_tracking) ->
 		$scope.subscribed = true
 
 		$scope.unsubscribe = () ->
@@ -24,6 +24,9 @@ define [
 				controller: "DeleteAccountModalController",
 				scope: $scope
 			)
+
+		$scope.upgradeIntegration = (service) ->
+			event_tracking.send 'subscription-funnel', 'settings-page', service
 	]
 
 	App.controller "DeleteAccountModalController", [
diff --git a/services/web/public/coffee/main/contact-us.coffee b/services/web/public/coffee/main/contact-us.coffee
index 138f459890..2d1dee6d34 100644
--- a/services/web/public/coffee/main/contact-us.coffee
+++ b/services/web/public/coffee/main/contact-us.coffee
@@ -103,5 +103,6 @@ define [
 
 			request.then (response)->
 				$scope.sent = true
+				event_tracking.send 'subscription-funnel', 'plans-page', 'group-inquiry-sent'
 				$scope.error = (response.status != 200)
 				$scope.$apply()
diff --git a/services/web/public/coffee/main/plans.coffee b/services/web/public/coffee/main/plans.coffee
index 450331a25f..060517a9d5 100644
--- a/services/web/public/coffee/main/plans.coffee
+++ b/services/web/public/coffee/main/plans.coffee
@@ -369,9 +369,10 @@ define [
 
 		$scope.switchToAnnual = ->
 			$scope.ui.view = "annual"
-			event_tracking.send 'subscription-funnel', 'plans-page', 'student-prices'
+			event_tracking.send 'subscription-funnel', 'plans-page', 'annual-prices'
 
 		$scope.openGroupPlanModal = () ->
 			$modal.open {
 				templateUrl: "groupPlanModalTemplate"
 			}
+			event_tracking.send 'subscription-funnel', 'plans-page', 'group-inquiry-potential'