diff --git a/src/components/Onboarding/steps/Analytics.js b/src/components/Onboarding/steps/Analytics.js
index dffd21f7..bfd63e00 100644
--- a/src/components/Onboarding/steps/Analytics.js
+++ b/src/components/Onboarding/steps/Analytics.js
@@ -7,6 +7,7 @@ import { saveSettings } from 'actions/settings'
 import Box from 'components/base/Box'
 import CheckBox from 'components/base/CheckBox'
 import TrackPage from 'analytics/TrackPage'
+import Track from 'analytics/Track'
 import { Title, Description, FixedTopContainer, StepContainerInner } from '../helperComponents'
 import OnboardingFooter from '../OnboardingFooter'
 
@@ -68,6 +69,14 @@ class Analytics extends PureComponent<StepProps, State> {
                 <AnalyticsText>{t('onboarding:analytics.sentryLogs.desc')}</AnalyticsText>
               </Box>
               <Box justifyContent="center">
+                <Track
+                  onUpdate
+                  event={
+                    sentryLogsToggle
+                      ? 'Sentry Logs Enabled Onboarding'
+                      : 'Sentry Logs Disabled Onboarding'
+                  }
+                />
                 <CheckBox isChecked={sentryLogsToggle} onChange={this.handleSentryLogsToggle} />
               </Box>
             </Container>
@@ -77,6 +86,14 @@ class Analytics extends PureComponent<StepProps, State> {
                 <AnalyticsText>{t('onboarding:analytics.shareAnalytics.desc')}</AnalyticsText>
               </Box>
               <Box justifyContent="center">
+                <Track
+                  onUpdate
+                  event={
+                    analyticsToggle
+                      ? 'Analytics Enabled Onboarding'
+                      : 'Analytics Disabled Onboarding'
+                  }
+                />
                 <CheckBox isChecked={analyticsToggle} onChange={this.handleAnalyticsToggle} />
               </Box>
             </Container>
diff --git a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
index 52de6111..11d639cd 100644
--- a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
+++ b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
@@ -36,7 +36,7 @@ export function GenuineCheckUnavailableFooter({
         <Button
           padded
           disabled={false}
-          event="Skip Genuine Check"
+          event="Skip Genuine Check Onboarding"
           onClick={() => nextStep()}
           mx={2}
         >
diff --git a/src/components/Onboarding/steps/SetPassword.js b/src/components/Onboarding/steps/SetPassword.js
index a512b63c..6fca39f4 100644
--- a/src/components/Onboarding/steps/SetPassword.js
+++ b/src/components/Onboarding/steps/SetPassword.js
@@ -135,7 +135,14 @@ class SetPassword extends PureComponent<StepProps, State> {
             {t('app:common.back')}
           </Button>
           <Box horizontal ml="auto">
-            <Button padded disabled={false} onClick={() => nextStep()} mx={2}>
+            <Button
+              padded
+              event="Skip Password Onboarding"
+              onClick={() => nextStep()}
+              disabled={false}
+              onClick={() => nextStep()}
+              mx={2}
+            >
               {t('app:common.skipThisStep')}
             </Button>
             <Button
diff --git a/src/components/SettingsPage/sections/Profile.js b/src/components/SettingsPage/sections/Profile.js
index 044ea9d7..e89cb4e4 100644
--- a/src/components/SettingsPage/sections/Profile.js
+++ b/src/components/SettingsPage/sections/Profile.js
@@ -192,7 +192,10 @@ class TabProfile extends PureComponent<Props, State> {
             title={t('app:settings.profile.analytics')}
             desc={t('app:settings.profile.analyticsDesc')}
           >
-            <Track onUpdate event={settings.sentryLogs ? 'SentryEnabled' : 'SentryDisabled'} />
+            <Track
+              onUpdate
+              event={settings.shareAnalytics ? 'AnalyticsEnabled' : 'AnalyticsDisabled'}
+            />
             <CheckBox
               isChecked={settings.shareAnalytics}
               onChange={shareAnalytics => saveSettings({ shareAnalytics })}
diff --git a/src/middlewares/analytics.js b/src/middlewares/analytics.js
index 26d116b7..37810eff 100644
--- a/src/middlewares/analytics.js
+++ b/src/middlewares/analytics.js
@@ -1,5 +1,5 @@
 import { shareAnalyticsSelector } from 'reducers/settings'
-import { start, stop } from 'analytics/segment'
+import { start, stop, track } from 'analytics/segment'
 
 let isAnalyticsStarted = false
 
@@ -12,6 +12,8 @@ export default store => next => action => {
     if (shareAnalytics) {
       start(store)
     } else {
+      //TODO add user uuid
+      track('Stopping Analytics')
       stop()
     }
   }