diff --git a/test/server_side/analytics.test.js b/test/server_side/analytics.test.js
index 2c421f9dab..059414be23 100644
--- a/test/server_side/analytics.test.js
+++ b/test/server_side/analytics.test.js
@@ -221,7 +221,8 @@ describe('analytics', function() {
         var user = {
           stats: stats,
           contributor: { level: 1 },
-          purchased: { plan: { planId: 'foo-plan' } }
+          purchased: { plan: { planId: 'foo-plan' } },
+          flags: {tour: {intro: -2}}
         };
 
         analyticsData.user = user;
@@ -246,7 +247,8 @@ describe('analytics', function() {
             Level: 4,
             Mana: 30,
             contributorLevel: 1,
-            subscription: 'foo-plan'
+            subscription: 'foo-plan',
+            tutorialComplete: true
           }
         });
       });
diff --git a/website/public/js/services/analyticsServices.js b/website/public/js/services/analyticsServices.js
index 244aec529a..135e7a205d 100644
--- a/website/public/js/services/analyticsServices.js
+++ b/website/public/js/services/analyticsServices.js
@@ -107,8 +107,7 @@
       properties.Level = user.stats.lvl;
       properties.Mana = Math.floor(user.stats.mp);
     }
-    if (user.flags && user.flags.tour && user.flags.tour.intro === -2) {properties.tutorialComplete = true}
-	else {properties.tutorialComplete = false};
+    properties.tutorialComplete = user.flags && user.flags.tour && user.flags.tour.intro === -2;
     if (user.contributor && user.contributor.level) properties.contributorLevel = user.contributor.level;
     if (user.purchased && user.purchased.plan.planId) properties.subscription = user.purchased.plan.planId;
   }
diff --git a/website/src/analytics.js b/website/src/analytics.js
index ecae3768d5..ad35adb9e7 100644
--- a/website/src/analytics.js
+++ b/website/src/analytics.js
@@ -152,6 +152,8 @@ function _formatUserData(user) {
     properties.Mana = Math.floor(user.stats.mp);
   }
 
+  properties.tutorialComplete = user.flags && user.flags.tour && user.flags.tour.intro === -2;
+
   if (user.contributor && user.contributor.level) {
     properties.contributorLevel = user.contributor.level;
   }