diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 47ef7cca23..a557a71a4c 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -136,7 +136,7 @@ export class UsersComponent implements OnInit {
           this.roles.map(role =>
             this.fb.group({
               [role.name]: [
-                this.selectedUserRoles.length
+                this.selected.id
                   ? !!snq(() => this.selectedUserRoles.find(userRole => userRole.id === role.id))
                   : role.isDefault,
               ],
@@ -181,7 +181,7 @@ export class UsersComponent implements OnInit {
       )
       .subscribe((state: Identity.State) => {
         this.selected = state.selectedUser;
-        this.selectedUserRoles = state.selectedUserRoles;
+        this.selectedUserRoles = state.selectedUserRoles || [];
         this.openModal();
       });
   }