diff --git a/modules/account/Volo.Abp.Account.slnx b/modules/account/Volo.Abp.Account.slnx
index 031e142df9..1beae2db60 100644
--- a/modules/account/Volo.Abp.Account.slnx
+++ b/modules/account/Volo.Abp.Account.slnx
@@ -2,6 +2,7 @@
   <Folder Name="/src/">
     <Project Path="src/Volo.Abp.Account.Application.Contracts/Volo.Abp.Account.Application.Contracts.csproj" />
     <Project Path="src/Volo.Abp.Account.Application/Volo.Abp.Account.Application.csproj" />
+    <Project Path="src/Volo.Abp.Account.Blazor.MudBlazor/Volo.Abp.Account.Blazor.MudBlazor.csproj" />
     <Project Path="src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj" />
     <Project Path="src/Volo.Abp.Account.HttpApi.Client/Volo.Abp.Account.HttpApi.Client.csproj" />
     <Project Path="src/Volo.Abp.Account.HttpApi/Volo.Abp.Account.HttpApi.csproj" />
diff --git a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/AbpAccountBlazorMudBlazorModule.cs b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/AbpAccountBlazorMudBlazorModule.cs
index fa7a53b8c1..40427f0f43 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/AbpAccountBlazorMudBlazorModule.cs
+++ b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/AbpAccountBlazorMudBlazorModule.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Account.Blazor.MudBlazor.Pages.Account;
 using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
-using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
 using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
diff --git a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor
index 4a1a0f8992..2753f95c28 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor
+++ b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor
@@ -1,14 +1,9 @@
 @page "/account/manage-profile"
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.Extensions.Localization
+@using global::MudBlazor
 @using Volo.Abp.Account.Localization
-@using Volo.Abp.AspNetCore.Components.Web
 @using Volo.Abp.MudBlazorUI.Components.ObjectExtending
 @using Volo.Abp.ObjectExtending
-@using Volo.Abp.Data
-@using Volo.Abp.Identity
 
-@inject IStringLocalizer<AccountResource> Localizer
 @inherits AbpAccountComponentBase
 
 <MudGrid>
diff --git a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor.cs b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor.cs
index 7d4aba25d9..62bff7cadc 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor.cs
+++ b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor.cs
@@ -2,6 +2,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 using MudBlazor;
+using Volo.Abp.Account.Localization;
 using Volo.Abp.AspNetCore.Components.Messages;
 using Volo.Abp.Identity;
 using Volo.Abp.MudBlazorUI;
@@ -50,7 +51,13 @@ public partial class AccountManage
 
     protected async Task ChangePasswordAsync()
     {
-        if (_changePasswordForm == null || !await _changePasswordForm.Validate())
+        if (_changePasswordForm == null)
+        {
+            return;
+        }
+
+        await _changePasswordForm.Validate();
+        if (!_changePasswordForm.IsValid)
         {
             return;
         }
@@ -85,11 +92,18 @@ public partial class AccountManage
 
     protected virtual async Task UpdatePersonalInfoAsync()
     {
-        if (_personalInfoForm == null || !await _personalInfoForm.Validate())
+        if (_personalInfoForm == null)
         {
             return;
         }
 
+        await _personalInfoForm.Validate();
+        
+        if (!_personalInfoForm.IsValid)
+        {
+            return;
+        }
+        
         if (PersonalInfoModel == null)
         {
             return;
diff --git a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/_Imports.razor b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/_Imports.razor
index 97ced1d380..95b2bfdc7f 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/_Imports.razor
+++ b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/_Imports.razor
@@ -3,4 +3,3 @@
 @using Volo.Abp.MudBlazorUI
 @using Volo.Abp.MudBlazorUI.Components
 @using MudBlazor
-@using MudBlazor.Components