diff --git a/src/components/pages/PbxConfiguration/CscPbxGroup.vue b/src/components/pages/PbxConfiguration/CscPbxGroup.vue
index 15b1cc9a..abe7c754 100644
--- a/src/components/pages/PbxConfiguration/CscPbxGroup.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxGroup.vue
@@ -15,7 +15,7 @@
                 class="csc-item-title"
                 label
             >
-                {{ group.display_name }}
+                {{ groupName(group.id) }}
             </q-item-tile>
             <q-item-tile
                 v-if="!expanded"
@@ -50,7 +50,7 @@
                     <span
                         class="csc-item-value"
                         v-for="seat in group.seats"
-                    >{{ seat.display_name }}
+                    >{{ seatName(seat.id) }}
                     </span>
                 </div>
             </q-item-tile>
@@ -227,7 +227,9 @@
             'huntPolicyOptions',
             'aliasNumberOptions',
             'seatOptions',
-            'loading'
+            'loading',
+            'groupName',
+            'seatName'
         ],
         data () {
             return {
diff --git a/src/components/pages/PbxConfiguration/CscPbxGroups.vue b/src/components/pages/PbxConfiguration/CscPbxGroups.vue
index 37df4a38..ae96115e 100644
--- a/src/components/pages/PbxConfiguration/CscPbxGroups.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxGroups.vue
@@ -63,6 +63,8 @@
                 :seat-options="seatOptions"
                 :hunt-policy-options="huntPolicyOptions"
                 :loading="isItemLoading(group.id)"
+                :group-name="groupName"
+                :seat-name="seatName"
                 @remove="removeGroupDialog"
                 @save-name="setGroupName"
                 @save-extension="setGroupExtension"
@@ -220,7 +222,9 @@
                 'lastRemovedGroup',
                 'lastUpdatedField',
                 'updateAliasNumbersState',
-                'updateGroupsAndSeatsState'
+                'updateGroupsAndSeatsState',
+                'groupName',
+                'seatName'
             ]),
             isMobile() {
                 return Platform.is.mobile;
diff --git a/src/components/pages/PbxConfiguration/CscPbxSeat.vue b/src/components/pages/PbxConfiguration/CscPbxSeat.vue
index ed5912ff..68eb4a38 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSeat.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSeat.vue
@@ -15,7 +15,7 @@
                 class="csc-item-title"
                 label
             >
-                {{ seat.display_name }}
+                {{ seatName(seat.id) }}
             </q-item-tile>
             <q-item-tile
                 v-if="!expanded"
@@ -50,7 +50,7 @@
                         class="csc-item-value"
                         v-for="group in seat.groups"
                     >
-                        {{ group.display_name }}
+                        {{ groupName(group.id) }}
                     </span>
                 </div>
             </q-item-tile>
@@ -201,7 +201,9 @@
             'aliasNumberOptions',
             'groupOptions',
             'loading',
-            'callQueue'
+            'callQueue',
+            'seatName',
+            'groupName'
         ],
         data () {
             return {
diff --git a/src/components/pages/PbxConfiguration/CscPbxSeats.vue b/src/components/pages/PbxConfiguration/CscPbxSeats.vue
index cb5feaf6..a3e309ad 100644
--- a/src/components/pages/PbxConfiguration/CscPbxSeats.vue
+++ b/src/components/pages/PbxConfiguration/CscPbxSeats.vue
@@ -63,6 +63,8 @@
                     :group-options="groupOptions"
                     @remove="removeSeatDialog"
                     :loading="isItemLoading(seat.id)"
+                    :seat-name="seatName"
+                    :group-name="groupName"
                     @save-name="setSeatName"
                     @save-extension="setSeatExtension"
                     @save-alias-numbers="updateAliasNumbers"
@@ -185,7 +187,9 @@
                 'lastUpdatedField',
                 'updateAliasNumbersState',
                 'updateGroupsAndSeatsState',
-                'updateState'
+                'updateState',
+                'seatName',
+                'groupName'
             ]),
             groupOptions() {
                 let groups = [];
diff --git a/src/store/pbx-config/getters.js b/src/store/pbx-config/getters.js
index a24fd3be..4269e05a 100644
--- a/src/store/pbx-config/getters.js
+++ b/src/store/pbx-config/getters.js
@@ -407,5 +407,19 @@ export default {
         return (handle) => {
             return state.uploadSoundFileProgresses[handle] || 0;
         }
+    },
+    seatName(state) {
+        return (id) => {
+            let display_name = state.seats[id].display_name;
+            let webusername = state.seats[id].webusername;
+            return display_name ? display_name : webusername;
+        }
+    },
+    groupName(state) {
+        return (id) => {
+            let display_name = state.groups[id].display_name;
+            let webusername = state.groups[id].webusername;
+            return display_name ? display_name : webusername;
+        }
     }
 }