diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index ed33a5f5d..a11305806 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -49,6 +49,7 @@ import com.android.emailcommon.VendorPolicyLoader;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.HostAuth;
 import com.android.emailcommon.service.SyncWindow;
+import com.android.mail.analytics.Analytics;
 import com.android.mail.providers.MailAppProvider;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.utils.LogUtils;
@@ -425,6 +426,13 @@ public class AccountSetupFinal extends AccountSetupActivity
         }
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        Analytics.getInstance().activityStart(this);
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -451,6 +459,13 @@ public class AccountSetupFinal extends AccountSetupActivity
         outState.putBoolean(SAVESTATE_KEY_PASSWORD_FAILED, mPasswordFailed);
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        Analytics.getInstance().activityStop(this);
+    }
+
     /**
      * Swap in the new fragment according to mState. This pushes the current fragment onto the back
      * stack, so only call it once per transition.