diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index b96b99bb4..9a6e3e6cc 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -142,7 +142,12 @@ export default {
                 var eventLabel = "";
                 //build comma separated list of all items in button list that we are going to display on page
                 this.answers.forEach((item) => {
-                    eventLabel += item.Name + ",";
+                    if (item.Name) {
+                        eventLabel += item.Name + ",";
+                    }
+                    if (item.buttonLabel) {
+                        eventLabel += item.buttonLabel + ",";
+                    }
                 });
 
                 eventLabel = eventLabel.slice(0, -1); //remove the last comma
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 1d9235374..783e55de2 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -6,7 +6,8 @@
         :buttonTypeObject="servicePackageRadio"
         v-model="selectedPackageName"
         :validationRules="validationRules"
-        :isRequired="isRequired" />
+        :isRequired="isRequired"
+        :logDisplayedValuesEvent="true" />
 </template>
 
 <script>