diff --git a/app/src/main/java/org/tasks/billing/BillingClient.java b/app/src/main/java/org/tasks/billing/BillingClient.java
index f18c42f08..e48dec1aa 100644
--- a/app/src/main/java/org/tasks/billing/BillingClient.java
+++ b/app/src/main/java/org/tasks/billing/BillingClient.java
@@ -102,20 +102,23 @@ public class BillingClient implements PurchasesUpdatedListener {
 
     // Update the UI and purchases inventory with new list of purchases
     inventory.clear();
-    onPurchasesUpdated(BillingResponse.OK, result.getPurchasesList());
+    add(result.getPurchasesList());
   }
 
   @Override
   public void onPurchasesUpdated(@BillingResponse int resultCode, List<Purchase> purchases) {
     if (resultCode == BillingResponse.OK) {
-      inventory.add(purchases);
-      localBroadcastManager.broadcastPurchasesUpdated();
-    } else {
-      String skus =
-          purchases == null ? "null" : Joiner.on(";").join(transform(purchases, Purchase::getSku));
-      Timber.i("onPurchasesUpdate(%s, %s)", BillingResponseToString(resultCode), skus);
-      tracker.reportIabResult(resultCode, skus);
+      add(purchases);
     }
+    String skus =
+        purchases == null ? "null" : Joiner.on(";").join(transform(purchases, Purchase::getSku));
+    Timber.i("onPurchasesUpdated(%s, %s)", BillingResponseToString(resultCode), skus);
+    tracker.reportIabResult(resultCode, skus);
+  }
+
+  private void add(List<Purchase> purchases) {
+    inventory.add(purchases);
+    localBroadcastManager.broadcastPurchasesUpdated();
   }
 
   /** Start a purchase flow */
diff --git a/app/src/release/res/xml/google_analytics.xml b/app/src/release/res/xml/google_analytics.xml
index b891e7aa9..1919d90f4 100644
--- a/app/src/release/res/xml/google_analytics.xml
+++ b/app/src/release/res/xml/google_analytics.xml
@@ -52,5 +52,9 @@
   <screenName name="org.tasks.preferences.MiscellaneousPreferences">MiscellaneousPreferences
   </screenName>
   <screenName name="org.tasks.widget.WidgetConfigActivity">WidgetConfigActivity</screenName>
-  <screenName name="org.tasks.caldav.CaldavCalendarSettingsActivity">CaldavSettingsActivity</screenName>
+  <screenName name="org.tasks.caldav.CaldavCalendarSettingsActivity">CaldavSettingsActivity
+  </screenName>
+  <screenName name="org.tasks.caldav.CaldavAccountSettingsActivity">CaldavAccountSettingsActivity
+  </screenName>
+  <screenName name="org.tasks.billing.PurchaseActivity">PurchaseActivity</screenName>
 </resources>
\ No newline at end of file