diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
index f78e18ef5..a3d0c638a 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
@@ -74,7 +74,12 @@
{{ user.email || '-' }}
-
+
{{ getDisplayRoles(user) }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
index bb1715711..ef3f76702 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
@@ -63,6 +63,10 @@ export class UserListingScreenComponent extends ListingComponent implement
return entities$.pipe(map(all => !all.find(u => u.id === this.currentUser.id)));
}
+ canDeactivate(user: User): boolean {
+ return !(user.isAdmin && this.currentUser.id === user.id);
+ }
+
async ngOnInit() {
await this._loadData();
}