diff --git a/src/components/call-forwarding/CscCfGroup.vue b/src/components/call-forwarding/CscCfGroup.vue
index 407786a7..d89cbc9d 100644
--- a/src/components/call-forwarding/CscCfGroup.vue
+++ b/src/components/call-forwarding/CscCfGroup.vue
@@ -20,9 +20,7 @@
                 v-if="mapping.type === 'cft'"
                 :loading="loading"
                 :mapping="mapping"
-                :destination-set="destinationSet"
-                :source-set="sourceSet"
-                :time-set="timeSet"
+                :primary-number-source="getPrimaryNumberSource"
             />
             <csc-cf-group-item
                 v-for="(destination, destinationIndex) in destinationSet.destinations"
@@ -53,6 +51,9 @@ import CscCfGroupTitle from 'components/call-forwarding/CscCfGroupTitle'
 import CscCfGroupItem from 'components/call-forwarding/CscCfGroupItem'
 import CscSpinner from 'components/CscSpinner'
 import CscCfGroupItemPrimaryNumber from 'components/call-forwarding/CscCfGroupItemPrimaryNumber'
+import {
+    mapState
+} from 'vuex'
 
 export default {
     name: 'CscCfGroup',
@@ -89,8 +90,22 @@ export default {
         }
     },
     computed: {
+        ...mapState('pbxGroups', [
+            'groupSelected'
+        ]),
+        ...mapState('pbxSeats', [
+            'seatSelected'
+        ]),
         waitIdentifier () {
             return 'csc-cf-group-' + this.destinationSet.id
+        },
+        getPrimaryNumberSource () {
+            if (this.groupSelected) {
+                return this.groupSelected
+            } else if (this.seatSelected) {
+                return this.seatSelected
+            }
+            return null
         }
     }
 }
diff --git a/src/components/call-forwarding/CscCfGroupItemPrimaryNumber.vue b/src/components/call-forwarding/CscCfGroupItemPrimaryNumber.vue
index e269ff3c..8fd04765 100644
--- a/src/components/call-forwarding/CscCfGroupItemPrimaryNumber.vue
+++ b/src/components/call-forwarding/CscCfGroupItemPrimaryNumber.vue
@@ -34,8 +34,7 @@
 
 <script>
 import {
-    mapGetters,
-    mapState
+    mapGetters
 } from 'vuex'
 import CscSpinner from 'components/CscSpinner'
 import numberFilter from '../../filters/number'
@@ -47,18 +46,6 @@ export default {
             type: Object,
             default: undefined
         },
-        destinationSet: {
-            type: Object,
-            default: undefined
-        },
-        sourceSet: {
-            type: Object,
-            default: undefined
-        },
-        timeSet: {
-            type: Object,
-            default: undefined
-        },
         loading: {
             type: Boolean,
             default: false
diff --git a/src/components/pages/CallForward/CscCallForwardDetails.vue b/src/components/pages/CallForward/CscCallForwardDetails.vue
index 05e1c40f..1769d1a2 100644
--- a/src/components/pages/CallForward/CscCallForwardDetails.vue
+++ b/src/components/pages/CallForward/CscCallForwardDetails.vue
@@ -66,7 +66,7 @@
                         </q-item-section>
                     </q-item>
                     <csc-cf-group-item-primary-number
-                        :primary-number-source="groupSelected"/>
+                        :primary-number-source="getPrimaryNumberSource"/>
                 </q-list>
                 <template
                     v-for="group in groups"
@@ -94,13 +94,6 @@ import {
     mapGetters,
     mapActions
 } from 'vuex'
-import {
-    RequestState
-} from 'src/store/common'
-import {
-    showGlobalError,
-    showToast
-} from 'src/helpers/ui'
 import CscCfGroup from 'components/call-forwarding/CscCfGroup'
 import CscSpinner from 'components/CscSpinner'
 import CscPopupMenu from 'components/CscPopupMenu'
@@ -133,9 +126,10 @@ export default {
     },
     computed: {
         ...mapState('pbxGroups', [
-            'groupSelected',
-            'groupUpdateState',
-            'groupUpdateError'
+            'groupSelected'
+        ]),
+        ...mapState('pbxSeats', [
+            'seatSelected'
         ]),
         ...mapGetters('user', [
             'hasSubscriberProfileAttribute',
@@ -148,15 +142,14 @@ export default {
             'destinationSetMap',
             'sourceSetMap',
             'timeSetMap'
-        ])
-    },
-    watch: {
-        groupUpdateState (state) {
-            if (state === RequestState.succeeded) {
-                showToast(this.getGroupUpdateToastMessage)
-            } else if (state === RequestState.failed) {
-                showGlobalError(this.groupUpdateError)
+        ]),
+        getPrimaryNumberSource () {
+            if (this.groupSelected) {
+                return this.groupSelected
+            } else if (this.seatSelected) {
+                return this.seatSelected
             }
+            return null
         }
     },
     mounted () {