diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor
index d8c9d063b8..3e101b38a4 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor
@@ -11,51 +11,55 @@
                 @if (ChangePasswordModel != null)
                 {
                     <TabPanel Name="Password">
-                        <Field>
-                            <FieldLabel>@L["DisplayName:CurrentPassword"]</FieldLabel>
-                            <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.CurrentPassword" />
-                        </Field>
-                        <Field>
-                            <FieldLabel>@L["DisplayName:NewPassword"]</FieldLabel>
-                            <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPassword" />
-                        </Field>
-                        <Field>
-                            <FieldLabel>@L["DisplayName:NewPasswordConfirm"]</FieldLabel>
-                            <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPasswordConfirm" />
-                        </Field>
-                        <Field>
-                            <Button Color="Color.Primary" Clicked="@ChangePasswordAsync">@L["Save"]</Button>
-                        </Field>
+                        <EditForm id="ChangePasswordForm" Model="@ChangePasswordModel" OnValidSubmit="ChangePasswordAsync">
+                            <Field>
+                                <FieldLabel>@L["DisplayName:CurrentPassword"]</FieldLabel>
+                                <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.CurrentPassword"/>
+                            </Field>
+                            <Field>
+                                <FieldLabel>@L["DisplayName:NewPassword"]</FieldLabel>
+                                <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPassword"/>
+                            </Field>
+                            <Field>
+                                <FieldLabel>@L["DisplayName:NewPasswordConfirm"]</FieldLabel>
+                                <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPasswordConfirm"/>
+                            </Field>
+                            <Field>
+                                <Button form="ChangePasswordForm" Color="Color.Primary" Clicked="@ChangePasswordAsync">@L["Save"]</Button>
+                            </Field>
+                        </EditForm>
                     </TabPanel>
                 }
                 @if (PersonalInfoModel != null)
                 {
                     <TabPanel Name="PersonalInfo">
-                        <Field>
-                            <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
-                            <TextEdit @bind-text="@PersonalInfoModel.UserName" />
-                        </Field>
-                        <Fields>
-                            <Field ColumnSize="ColumnSize.Is6">
-                                <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
-                                <TextEdit @bind-text="@PersonalInfoModel.Name" />
+                        <EditForm id="UpdatePersonalInfoForm" Model="@PersonalInfoModel" OnValidSubmit="UpdatePersonalInfoAsync">
+                            <Field>
+                                <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
+                                <TextEdit @bind-text="@PersonalInfoModel.UserName"/>
+                            </Field>
+                            <Fields>
+                                <Field ColumnSize="ColumnSize.Is6">
+                                    <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
+                                    <TextEdit @bind-text="@PersonalInfoModel.Name"/>
+                                </Field>
+                                <Field ColumnSize="ColumnSize.Is6">
+                                    <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
+                                    <TextEdit @bind-text="@PersonalInfoModel.Surname"/>
+                                </Field>
+                            </Fields>
+                            <Field>
+                                <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
+                                <TextEdit @bind-text="@PersonalInfoModel.Email"/>
+                            </Field>
+                            <Field>
+                                <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
+                                <TextEdit @bind-text="@PersonalInfoModel.PhoneNumber"/>
                             </Field>
-                            <Field ColumnSize="ColumnSize.Is6">
-                                <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
-                                <TextEdit @bind-text="@PersonalInfoModel.Surname" />
+                            <Field>
+                                <Button form="UpdatePersonalInfoForm" Color="Color.Primary" Clicked="@UpdatePersonalInfoAsync">@L["Save"]</Button>
                             </Field>
-                        </Fields>
-                        <Field>
-                            <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
-                            <TextEdit @bind-text="@PersonalInfoModel.Email" />
-                        </Field>
-                        <Field>
-                            <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
-                            <TextEdit @bind-text="@PersonalInfoModel.PhoneNumber" />
-                        </Field>
-                        <Field>
-                            <Button Color="Color.Primary" Clicked="@UpdatePersonalInfoAsync">@L["Save"]</Button>
-                        </Field>
+                        </EditForm>
                     </TabPanel>
                 }
             </Content>