diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
index da17738c1d..af162133da 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
@@ -100,9 +100,13 @@
     <button type="button" class="btn btn-secondary" #abpClose>
       {{ 'AbpIdentity::Cancel' | abpLocalization }}
     </button>
-    <button type="button" class="btn btn-primary" (click)="save()">
-      <i class="fa fa-check mr-1"></i> <span>{{ 'AbpIdentity::Save' | abpLocalization }}</span>
-    </button>
+    <abp-button
+      [requestType]="['POST', 'PUT']"
+      requestURLContainSearchValue="roles"
+      iconClass="fa fa-check"
+      (click)="save()"
+      >{{ 'AbpIdentity::Save' | abpLocalization }}</abp-button
+    >
   </ng-template>
 </abp-modal>
 
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index e7f4646039..9d5aa0a9f0 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -84,7 +84,7 @@
 
   <ng-template #abpBody>
     <perfect-scrollbar class="ps-show-always" style="max-height: 70vh;">
-      <form [formGroup]="form">
+      <form [formGroup]="form" validateOnSubmit>
         <ngb-tabset>
           <ngb-tab [title]="'AbpIdentity::UserInformations' | abpLocalization">
             <ng-template ngbTabContent>
@@ -183,9 +183,13 @@
     <button type="button" class="btn btn-secondary" #abpClose>
       {{ 'AbpIdentity::Cancel' | abpLocalization }}
     </button>
-    <button type="button" class="btn btn-primary" (click)="save()">
-      <i class="fa fa-check mr-1"></i> <span>{{ 'AbpIdentity::Save' | abpLocalization }}</span>
-    </button>
+    <abp-button
+      [requestType]="['POST', 'PUT']"
+      requestURLContainSearchValue="users"
+      iconClass="fa fa-check"
+      (click)="save()"
+      >{{ 'AbpIdentity::Save' | abpLocalization }}</abp-button
+    >
   </ng-template>
 </abp-modal>