diff --git a/website/client/src/components/group-plans/groupPlanCreationModal.vue b/website/client/src/components/group-plans/groupPlanCreationModal.vue
index 7b5546c78d..ff61a904b6 100644
--- a/website/client/src/components/group-plans/groupPlanCreationModal.vue
+++ b/website/client/src/components/group-plans/groupPlanCreationModal.vue
@@ -322,9 +322,8 @@ export default {
         eventName: 'group plan create',
         eventAction: 'group plan create',
         eventCategory: 'behavior',
-        createGroupName: this.newGroup.name,
-        demographicsCreated: this.newGroup.demographics,
-        typeCreated: this.newGroup.type,
+        demographics: this.newGroup.demographics,
+        type: this.newGroup.type,
       });
 
       if (this.upgradingGroup && this.upgradingGroup._id) {
diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue
index 3c098d9887..fb3abaf39e 100644
--- a/website/client/src/components/payments/successModal.vue
+++ b/website/client/src/components/payments/successModal.vue
@@ -43,13 +43,13 @@
           ]"
           class="group-input"
           :placeholder="'groupUseDefault'"
-          :value="groupPlanUpgraded.demographics"
-          @select="groupPlanUpgraded.demographics = $event"
+          :value="upgradedGroup.demographics"
+          @select="upgradedGroup.demographics = $event"
         />
         <button
           v-if="!paymentData.newGroup"
           class="btn btn-primary mx-auto"
-          :disabled="!groupPlanUpgraded.demographics"
+          :disabled="!upgradedGroup.demographics"
           @click="submit()"
         >
           {{ $t('submit') }}
@@ -363,8 +363,8 @@ export default {
           eventName: 'group plan upgrade',
           eventAction: 'group plan upgrade',
           eventCategory: 'behavior',
-          demographics: this.paymentData.group.demographics, // if that's where this lives?
-          typeUpgraded: this.paymentData.group.type,
+          demographics: this.upgradedGroup.demographics,
+          type: this.paymentData.group.type, // also tried this.upgradedGroup.type
         });
       }
       this.paymentData = {};
diff --git a/website/client/src/libs/analytics.js b/website/client/src/libs/analytics.js
index 6493a07f5f..9f81f6272f 100644
--- a/website/client/src/libs/analytics.js
+++ b/website/client/src/libs/analytics.js
@@ -83,12 +83,8 @@ function _gatherGroupStats (properties) {
 
   properties.UUID = user._id;
 
-  properties.createGroupName = group.newGroup.name;
-  properties.demographicsCreated = group.newGroup.demographics;
-  properties.typeCreated = group.newGroup.type;
-  // properties.upgradedGroupName = group.upgradedGroup.name;
-  // properties.demographicsUpgraded = group.upgradedGroup.demographics;
-  // properties.typeUpgraded = group.upgradedGroup.type;
+  properties.demographics = group.newGroup.demographics || group.upgradedGroup.demographics;
+  properties.type = group.newGroup.type || group.upgradedGroup.type;
 }
 
 export function setUser () {