diff --git a/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Themes/Basic/LoginDisplay.razor b/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Themes/Basic/LoginDisplay.razor
index e604ff4493..388eb25c62 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Themes/Basic/LoginDisplay.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Themes/Basic/LoginDisplay.razor
@@ -27,18 +27,20 @@
                     }
                 }
                 <DropdownDivider />
-                <DropdownItem Clicked="BeginSignOut">Logout</DropdownItem>
+                <DropdownItem Clicked="Logout">Logout</DropdownItem>
             </DropdownMenu>
         </Dropdown>
     </Authorized>
     <NotAuthorized>
-        <a class="nav-link" href="authentication/login">Log in</a>
+        <a class="nav-link" href="/Account/Login">Log in</a>
     </NotAuthorized>
 </AuthorizeView>
 @code{
 
     private async Task NavigateToAsync(string uri, string target = null)
     {
+        uri = uri.TrimStart('~');
+        
         if (target == "_blank")
         {
             await JsRuntime.InvokeVoidAsync("open", uri, target);
@@ -49,10 +51,8 @@
         }
     }
 
-    private async Task BeginSignOut()
+    private void Logout()
     {
-        // TODO
-        //await SignOutManager.SetSignOutState();
-        await NavigateToAsync("authentication/logout");
+        Navigation.NavigateTo("/Account/Logout", forceLoad: true);
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj b/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj
index 32d8a8da99..e6848e2fb9 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server/Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj
@@ -11,7 +11,6 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs
index 64ad999a38..ad55caadea 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs
@@ -11,23 +11,12 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Menus
 {
     public class MyProjectNameMenuContributor : IMenuContributor
     {
-        private readonly IConfiguration _configuration;
-
-        public MyProjectNameMenuContributor(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-
         public async Task ConfigureMenuAsync(MenuConfigurationContext context)
         {
             if (context.Menu.Name == StandardMenus.Main)
             {
                 await ConfigureMainMenuAsync(context);
             }
-            else if (context.Menu.Name == StandardMenus.User)
-            {
-                await ConfigureUserMenuAsync(context);
-            }
         }
 
         private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
@@ -46,26 +35,5 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Menus
 
             return Task.CompletedTask;
         }
-
-        private Task ConfigureUserMenuAsync(MenuConfigurationContext context)
-        {
-            var accountStringLocalizer = context.GetLocalizer<AccountResource>();
-            var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
-
-            var identityServerUrl = _configuration["AuthServer:Authority"] ?? "";
-
-            if (currentUser.IsAuthenticated)
-            {
-                context.Menu.AddItem(new ApplicationMenuItem(
-                    "Account.Manage",
-                    accountStringLocalizer["ManageYourProfile"],
-                    $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}",
-                    icon: "fa fa-cog",
-                    order: 1000,
-                    null));
-            }
-
-            return Task.CompletedTask;
-        }
     }
 }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
index 5196d184ad..a3288a31bb 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
@@ -17,7 +17,6 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server;
 using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Toolbars;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI;
@@ -195,7 +194,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server
         {
             Configure<AbpNavigationOptions>(options =>
             {
-                options.MenuContributors.Add(new MyProjectNameMenuContributor(context.Services.GetConfiguration()));
+                options.MenuContributors.Add(new MyProjectNameMenuContributor());
             });
         }