diff --git a/src/components/pages/PbxConfiguration/CscPbxAutoAttendantSelection.vue b/src/components/pages/PbxConfiguration/CscPbxAutoAttendantSelection.vue
index cb5ff84c..d702fc4d 100644
--- a/src/components/pages/PbxConfiguration/CscPbxAutoAttendantSelection.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxAutoAttendantSelection.vue
@@ -1,6 +1,8 @@
 <template>
     <q-select
         :label="selectedKeyLabel"
+        :model-value="modelValue"
+        :options="options"
         v-bind="$attrs"
     >
         <template
@@ -37,6 +39,14 @@
 export default {
     name: 'CscPbxAutoAttendantSelection',
     props: {
+        modelValue: {
+            type: Object,
+            default: undefined
+        },
+        options: {
+            type: Array,
+            default: () => []
+        },
         showSelectedItemIcon: {
             type: Boolean,
             default: true
@@ -44,19 +54,15 @@ export default {
     },
     computed: {
         selectedKeyLabel () {
-            const selectedValue = this.$attrs.value || { type: null }
+            const selectedValue = this.modelValue || { subscriberTypeTitle: null }
             let label = this.$t('Group/Seat/Pilot')
-            if (selectedValue.type !== null) {
-                label = ({
-                    pilot: this.$t('Pilot'),
-                    seat: this.$t('Seat'),
-                    group: this.$t('Group')
-                })[selectedValue.type]
+            if (selectedValue.subscriberTypeTitle !== null) {
+                label = this.$t(selectedValue.subscriberTypeTitle)
             }
             return label
         },
         selectedKeyIcon () {
-            return this.$attrs.value?.icon
+            return this.modelValue?.icon
         }
     }
 }
diff --git a/src/components/pages/PbxConfiguration/CscPbxDeviceConfig.vue b/src/components/pages/PbxConfiguration/CscPbxDeviceConfig.vue
index 33755336..1d651688 100644
--- a/src/components/pages/PbxConfiguration/CscPbxDeviceConfig.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxDeviceConfig.vue
@@ -256,7 +256,7 @@ export default {
         },
         onSave (newLine) {
             const newLines = []
-            const lines = _.clone(this.lines)
+            const lines = _.cloneDeep(this.lines)
             const line = this.getLineByKey(this.selectedKey)
             if (line !== null && newLine.type === null) {
                 delete lines[line.index]
diff --git a/src/components/pages/PbxConfiguration/CscPbxDeviceConfigKeyForm.vue b/src/components/pages/PbxConfiguration/CscPbxDeviceConfigKeyForm.vue
index 2a28dffb..2938dc90 100644
--- a/src/components/pages/PbxConfiguration/CscPbxDeviceConfigKeyForm.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxDeviceConfigKeyForm.vue
@@ -48,10 +48,10 @@
         />
         <csc-pbx-auto-attendant-selection
             v-if="changes.type && !hasTargetNumber"
-            :value="selectedKeySubscriber"
+            v-model="selectedKeySubscriber"
             :options="subscriberOptions"
             :disable="loading"
-            @input="keySubscriberChanged"
+            @update:model-value="keySubscriberChanged"
         />
         <csc-input
             v-if="showCustomNumberToggle && hasTargetNumber"
@@ -64,7 +64,7 @@
             :error="v$.changes.target_number.$errors.length > 0"
             :error-message="targetNumberErrorMessage"
             :label="$t('Number')"
-            @input="v$.changes.target_number.$touch()"
+            @update:model-value="v$.changes.target_number.$touch()"
         />
         <csc-list-spinner
             v-if="loading"
diff --git a/src/components/pages/PbxConfiguration/CscPbxDeviceFilters.vue b/src/components/pages/PbxConfiguration/CscPbxDeviceFilters.vue
index 813ce34f..db2f3680 100644
--- a/src/components/pages/PbxConfiguration/CscPbxDeviceFilters.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxDeviceFilters.vue
@@ -51,14 +51,14 @@
                 />
                 <csc-pbx-auto-attendant-selection
                     v-if="filterType === 'display_name'"
+                    v-model="typedFilter"
                     use-input
                     dense
                     :show-selected-item-icon="false"
-                    :value="typedFilter"
                     :options="subscribersOptionsFiltered"
                     :disable="loading"
                     @filter="filterSubscriberOptions"
-                    @input="triggerFilter"
+                    @update:model-value="triggerFilter"
                 />
             </div>
         </div>