diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index d0d21346f2..410ccc2cae 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -73,52 +73,17 @@
 <Modal @ref="CreateModal">
     <ModalBackdrop />
     <ModalContent Centered="true">
-        <ModalHeader>
-            <ModalTitle>@L["NewRole"]</ModalTitle>
-            <CloseButton Clicked="CloseCreateModalAsync" />
-        </ModalHeader>
-        <ModalBody>
-            <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
-                <Validation MessageLocalizer="@LH.Localize">
-                    <Field>
-                        <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
-                        <TextEdit @bind-Text="@NewEntity.Name">
-                            <Feedback>
-                                <ValidationError />
-                            </Feedback>
-                        </TextEdit>
-                    </Field>
-                </Validation>
-                <Field>
-                    <Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
-                    <Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
-                </Field>
-            </Validations>
-        </ModalBody>
-        <ModalFooter>
-            <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-            <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
-        </ModalFooter>
-    </ModalContent>
-</Modal>
-}
-@* ************************* EDIT MODAL ************************* *@
-@if (HasUpdatePermission)
-{
-    <Modal @ref="EditModal">
-        <ModalBackdrop />
-        <ModalContent Centered="true">
+        <Form id="RoleCreateForm">
             <ModalHeader>
-                <ModalTitle>@L["Edit"]</ModalTitle>
-                <CloseButton Clicked="CloseEditModalAsync" />
+                <ModalTitle>@L["NewRole"]</ModalTitle>
+                <CloseButton Clicked="CloseCreateModalAsync" />
             </ModalHeader>
             <ModalBody>
-                <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
-                    <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+                <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
                     <Validation MessageLocalizer="@LH.Localize">
                         <Field>
                             <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
-                            <TextEdit @bind-Text="EditingEntity.Name">
+                            <TextEdit @bind-Text="@NewEntity.Name">
                                 <Feedback>
                                     <ValidationError />
                                 </Feedback>
@@ -126,15 +91,54 @@
                         </Field>
                     </Validation>
                     <Field>
-                        <Check TValue="bool" @bind-Checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
-                        <Check TValue="bool" @bind-Checked="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
+                        <Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
+                        <Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
                     </Field>
                 </Validations>
             </ModalBody>
             <ModalFooter>
-                <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
+                <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+                <Button form="RoleCreateForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
             </ModalFooter>
+        </Form>
+    </ModalContent>
+</Modal>
+}
+@* ************************* EDIT MODAL ************************* *@
+@if (HasUpdatePermission)
+{
+    <Modal @ref="EditModal">
+        <ModalBackdrop />
+        <ModalContent Centered="true">
+            <Form id="RoleEditForm">
+                <ModalHeader>
+                    <ModalTitle>@L["Edit"]</ModalTitle>
+                    <CloseButton Clicked="CloseEditModalAsync" />
+                </ModalHeader>
+                <ModalBody>
+                    <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
+                        <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+                        <Validation MessageLocalizer="@LH.Localize">
+                            <Field>
+                                <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
+                                <TextEdit @bind-Text="EditingEntity.Name">
+                                    <Feedback>
+                                        <ValidationError />
+                                    </Feedback>
+                                </TextEdit>
+                            </Field>
+                        </Validation>
+                        <Field>
+                            <Check TValue="bool" @bind-Checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
+                            <Check TValue="bool" @bind-Checked="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
+                        </Field>
+                    </Validations>
+                </ModalBody>
+                <ModalFooter>
+                    <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
+                    <Button form="RoleEditForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
+                </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 8f8d872fc6..6f26d28a8b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -74,103 +74,105 @@
     <Modal @ref="CreateModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <ModalHeader>
-                <ModalTitle>@L["NewUser"]</ModalTitle>
-                <CloseButton Clicked="CloseCreateModalAsync" />
-            </ModalHeader>
-            <ModalBody>
-                <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
-                    <Tabs @bind-SelectedTab="@CreateModalSelectedTab">
-                        <Items>
-                            <Tab Name="UserInformations">@L["UserInformations"]</Tab>
-                            <Tab Name="Roles">@L["Roles"]</Tab>
-                        </Items>
-                        <Content>
-                            <TabPanel Name="UserInformations">
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
-                                        <TextEdit @bind-Text="NewEntity.UserName">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
-                                        <TextEdit @bind-Text="NewEntity.Name">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
-                                        <TextEdit @bind-Text="NewEntity.Surname">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
-                                        <TextEdit Role="TextRole.Password" @bind-Text="NewEntity.Password">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
-                                        <TextEdit @bind-Text="NewEntity.Email">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
+            <Form id="UserCreateForm">
+                <ModalHeader>
+                    <ModalTitle>@L["NewUser"]</ModalTitle>
+                    <CloseButton Clicked="CloseCreateModalAsync" />
+                </ModalHeader>
+                <ModalBody>
+                    <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
+                        <Tabs @bind-SelectedTab="@CreateModalSelectedTab">
+                            <Items>
+                                <Tab Name="UserInformations">@L["UserInformations"]</Tab>
+                                <Tab Name="Roles">@L["Roles"]</Tab>
+                            </Items>
+                            <Content>
+                                <TabPanel Name="UserInformations">
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                                            <TextEdit @bind-Text="NewEntity.UserName">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                                            <TextEdit @bind-Text="NewEntity.Name">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                                            <TextEdit @bind-Text="NewEntity.Surname">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
+                                            <TextEdit Role="TextRole.Password" @bind-Text="NewEntity.Password">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                                            <TextEdit @bind-Text="NewEntity.Email">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                                            <TextEdit @bind-Text="NewEntity.PhoneNumber">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
                                     <Field>
-                                        <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
-                                        <TextEdit @bind-Text="NewEntity.PhoneNumber">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
+                                        <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
                                     </Field>
-                                </Validation>
-                                <Field>
-                                    <Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
-                                </Field>
-                            </TabPanel>
-                            <TabPanel Name="Roles">
-                                @if (NewUserRoles != null)
-                                {
-                                    @foreach (var role in NewUserRoles)
+                                </TabPanel>
+                                <TabPanel Name="Roles">
+                                    @if (NewUserRoles != null)
                                     {
-                                        <Field>
-                                            <input type="hidden" @bind-value="@role.Name" />
-                                            <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
-                                        </Field>
+                                        @foreach (var role in NewUserRoles)
+                                        {
+                                            <Field>
+                                                <input type="hidden" @bind-value="@role.Name" />
+                                                <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
+                                            </Field>
+                                        }
                                     }
-                                }
-                            </TabPanel>
-                        </Content>
-                    </Tabs>
-                </Validations>
-            </ModalBody>
-            <ModalFooter>
-                <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
-            </ModalFooter>
+                                </TabPanel>
+                            </Content>
+                        </Tabs>
+                    </Validations>
+                </ModalBody>
+                <ModalFooter>
+                    <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+                    <Button form="UserCreateForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
+                </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }
@@ -181,105 +183,107 @@
     <Modal @ref="EditModal">
         <ModalBackdrop />
         <ModalContent Centered="true">
-            <ModalHeader>
-                <ModalTitle>@L["Edit"]</ModalTitle>
-                <CloseButton Clicked="CloseEditModalAsync" />
-            </ModalHeader>
-            <ModalBody>
-                <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
-                    <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
+            <Form id="UserEditForm">
+                <ModalHeader>
+                    <ModalTitle>@L["Edit"]</ModalTitle>
+                    <CloseButton Clicked="CloseEditModalAsync" />
+                </ModalHeader>
+                <ModalBody>
+                    <Validations @ref="@EditValidationsRef" Model="@EditingEntity" ValidateOnLoad="false">
+                        <input type="hidden" name="ConcurrencyStamp" @bind-value="EditingEntity.ConcurrencyStamp" />
 
-                    <Tabs @bind-SelectedTab="@EditModalSelectedTab">
-                        <Items>
-                            <Tab Name="UserInformations">@L["UserInformations"]</Tab>
-                            <Tab Name="Roles">@L["Roles"]</Tab>
-                        </Items>
-                        <Content>
-                            <TabPanel Name="UserInformations">
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
-                                        <TextEdit @bind-Text="EditingEntity.UserName">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
-                                        <TextEdit @bind-Text="EditingEntity.Name">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
-                                        <TextEdit @bind-Text="EditingEntity.Surname">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
-                                        <TextEdit Role="TextRole.Password" @bind-Text="EditingEntity.Password">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
-                                    <Field>
-                                        <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
-                                        <TextEdit @bind-Text="EditingEntity.Email">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
-                                    </Field>
-                                </Validation>
-                                <Validation MessageLocalizer="@LH.Localize">
+                        <Tabs @bind-SelectedTab="@EditModalSelectedTab">
+                            <Items>
+                                <Tab Name="UserInformations">@L["UserInformations"]</Tab>
+                                <Tab Name="Roles">@L["Roles"]</Tab>
+                            </Items>
+                            <Content>
+                                <TabPanel Name="UserInformations">
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                                            <TextEdit @bind-Text="EditingEntity.UserName">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                                            <TextEdit @bind-Text="EditingEntity.Name">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                                            <TextEdit @bind-Text="EditingEntity.Surname">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
+                                            <TextEdit Role="TextRole.Password" @bind-Text="EditingEntity.Password">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                                            <TextEdit @bind-Text="EditingEntity.Email">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
+                                    <Validation MessageLocalizer="@LH.Localize">
+                                        <Field>
+                                            <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                                            <TextEdit @bind-Text="EditingEntity.PhoneNumber">
+                                                <Feedback>
+                                                    <ValidationError />
+                                                </Feedback>
+                                            </TextEdit>
+                                        </Field>
+                                    </Validation>
                                     <Field>
-                                        <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
-                                        <TextEdit @bind-Text="EditingEntity.PhoneNumber">
-                                            <Feedback>
-                                                <ValidationError />
-                                            </Feedback>
-                                        </TextEdit>
+                                        <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
                                     </Field>
-                                </Validation>
-                                <Field>
-                                    <Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"]</Check>
-                                </Field>
-                            </TabPanel>
-                            <TabPanel Name="Roles">
-                                @if (EditUserRoles != null)
-                                {
-                                    @foreach (var role in EditUserRoles)
+                                </TabPanel>
+                                <TabPanel Name="Roles">
+                                    @if (EditUserRoles != null)
                                     {
-                                        <Field>
-                                            <input type="hidden" @bind-value="@role.Name" />
-                                            <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
-                                        </Field>
+                                        @foreach (var role in EditUserRoles)
+                                        {
+                                            <Field>
+                                                <input type="hidden" @bind-value="@role.Name" />
+                                                <Check TValue="bool" @bind-Checked="@role.IsAssigned">@role.Name</Check>
+                                            </Field>
+                                        }
                                     }
-                                }
-                            </TabPanel>
-                        </Content>
-                    </Tabs>
-                </Validations>
-            </ModalBody>
-            <ModalFooter>
-                <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                <Button Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
-            </ModalFooter>
+                                </TabPanel>
+                            </Content>
+                        </Tabs>
+                    </Validations>
+                </ModalBody>
+                <ModalFooter>
+                    <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
+                    <Button form="UserEditForm" Type="ButtonType.Submit" PreventDefaultOnSubmit="true" Color="Color.Primary" Clicked="UpdateEntityAsync">@L["Save"]</Button>
+                </ModalFooter>
+            </Form>
         </ModalContent>
     </Modal>
 }