diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts
index 8684cb4db..b2d9b8abd 100644
--- a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts
+++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts
@@ -53,6 +53,7 @@ export class UsersAndGroupsComponent
           this.users = r.results
         },
         error: (e) => {
+          this.users = []
           this.toastService.showError($localize`Error retrieving users`, e)
         },
       })
@@ -65,6 +66,7 @@ export class UsersAndGroupsComponent
           this.groups = r.results
         },
         error: (e) => {
+          this.groups = []
           this.toastService.showError($localize`Error retrieving groups`, e)
         },
       })
@@ -77,6 +79,7 @@ export class UsersAndGroupsComponent
           this.ssoGroups = r.results
         },
         error: (e) => {
+          this.ssoGroups = []
           this.toastService.showError($localize`Error retrieving SSO groups`, e)
         },
       })
diff --git a/src-ui/src/app/components/common/edit-dialog/sso-group-edit-dialog/sso-group-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/sso-group-edit-dialog/sso-group-edit-dialog.component.ts
index fb2dc1ebe..448b06be3 100644
--- a/src-ui/src/app/components/common/edit-dialog/sso-group-edit-dialog/sso-group-edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/sso-group-edit-dialog/sso-group-edit-dialog.component.ts
@@ -11,7 +11,7 @@ import { SsoGroupService } from '../../../../services/rest/sso-group.service'
 import { first } from 'rxjs'
 
 @Component({
-  selector: 'app-sso-group-edit-dialog',
+  selector: 'pngx-sso-group-edit-dialog',
   templateUrl: './sso-group-edit-dialog.component.html',
   styleUrls: ['./sso-group-edit-dialog.component.scss'],
 })