diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index 0d368907b5d..40a398c2f97 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -193,6 +193,7 @@ export class PeopleComponent extends BasePeopleComponent<OrganizationUserUserDet
             comp.name = this.userNamePipe.transform(user);
             comp.organizationId = this.organizationId;
             comp.organizationUserId = user != null ? user.id : null;
+            comp.usesKeyConnector = user?.usesKeyConnector;
             comp.onSavedUser.subscribe(() => {
                 modal.close();
                 this.load();
diff --git a/src/app/organizations/manage/user-add-edit.component.ts b/src/app/organizations/manage/user-add-edit.component.ts
index cb05dbe8a6a..0ea8d609f6c 100644
--- a/src/app/organizations/manage/user-add-edit.component.ts
+++ b/src/app/organizations/manage/user-add-edit.component.ts
@@ -33,6 +33,7 @@ export class UserAddEditComponent implements OnInit {
     @Input() name: string;
     @Input() organizationUserId: string;
     @Input() organizationId: string;
+    @Input() usesKeyConnector: boolean = false;
     @Output() onSavedUser = new EventEmitter();
     @Output() onDeletedUser = new EventEmitter();
 
@@ -193,9 +194,10 @@ export class UserAddEditComponent implements OnInit {
             return;
         }
 
+        const message = this.usesKeyConnector ? 'removeUserConfirmationKeyConnector' : 'removeUserConfirmation';
         const confirmed = await this.platformUtilsService.showDialog(
-            this.i18nService.t('removeUserConfirmation'), this.name,
-            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
+            this.i18nService.t(message), this.name, this.i18nService.t('yes'), this.i18nService.t('no'), 'warning'
+        );
         if (!confirmed) {
             return false;
         }