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 356292d438..0be2c3d66d 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
@@ -1,5 +1,5 @@
 import { ABP, ConfigState } from '@abp/ng.core';
-import { ConfirmationService, Toaster } from '@abp/ng.theme.shared';
+import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
 import { Component, OnInit, TemplateRef, TrackByFunction, ViewChild } from '@angular/core';
 import {
   AbstractControl,
@@ -17,7 +17,6 @@ import snq from 'snq';
 import {
   CreateUser,
   DeleteUser,
-  GetRoles,
   GetUserById,
   GetUserRoles,
   GetUsers,
@@ -25,6 +24,7 @@ import {
 } from '../../actions/identity.actions';
 import { Identity } from '../../models/identity';
 import { IdentityState } from '../../states/identity.state';
+import { IdentityService } from '../../services/identity.service';
 @Component({
   selector: 'abp-users',
   templateUrl: './users.component.html',
@@ -81,6 +81,7 @@ export class UsersComponent implements OnInit {
     private confirmationService: ConfirmationService,
     private fb: FormBuilder,
     private store: Store,
+    private identityService: IdentityService,
   ) {}
 
   ngOnInit() {
@@ -119,8 +120,8 @@ export class UsersComponent implements OnInit {
   }
 
   buildForm() {
-    this.store.dispatch(new GetRoles({ maxResultCount: 1000, skipCount: 0 })).subscribe(() => {
-      this.roles = this.store.selectSnapshot(IdentityState.getRoles);
+    this.identityService.getAllRoles().subscribe(({ items }) => {
+      this.roles = items;
       this.form = this.fb.group({
         userName: [this.selected.userName || '', [Validators.required, Validators.maxLength(256)]],
         email: [
@@ -223,8 +224,8 @@ export class UsersComponent implements OnInit {
       .warn('AbpIdentity::UserDeletionConfirmationMessage', 'AbpIdentity::AreYouSure', {
         messageLocalizationParams: [userName],
       })
-      .subscribe((status: Toaster.Status) => {
-        if (status === Toaster.Status.confirm) {
+      .subscribe((status: Confirmation.Status) => {
+        if (status === Confirmation.Status.confirm) {
           this.store.dispatch(new DeleteUser(id)).subscribe(() => this.get());
         }
       });
diff --git a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts b/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
index 8499a3c069..ae9ca3a921 100644
--- a/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
+++ b/npm/ng-packs/packages/identity/src/lib/services/identity.service.ts
@@ -19,6 +19,15 @@ export class IdentityService {
     return this.rest.request<null, Identity.RoleResponse>(request);
   }
 
+  getAllRoles(): Observable<Identity.RoleResponse> {
+    const request: Rest.Request<null> = {
+      method: 'GET',
+      url: '/api/identity/roles/all',
+    };
+
+    return this.rest.request<null, Identity.RoleResponse>(request);
+  }
+
   getRoleById(id: string): Observable<Identity.RoleItem> {
     const request: Rest.Request<null> = {
       method: 'GET',