diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostMenuContributor.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostMenuContributor.cs
index 1f1421546e..66a3364eae 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostMenuContributor.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostMenuContributor.cs
@@ -4,6 +4,7 @@ using Localization.Resources.AbpUi;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
+using Volo.Abp.Authorization.Permissions;
 using Volo.CmsKit.Localization;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.Users;
@@ -31,30 +32,26 @@ namespace Volo.CmsKit
 
         private void AddLogoutItemToMenu(MenuConfigurationContext context)
         {
-            var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
             var l = context.GetLocalizer<CmsKitResource>();
 
-            if (currentUser.IsAuthenticated)
-            {
-                context.Menu.Items.Add(new ApplicationMenuItem(
-                    "Account.Manage",
-                    l["ManageYourProfile"],
-                    $"{_configuration["AuthServer:Authority"].EnsureEndsWith('/')}Account/Manage",
-                    icon: "fa fa-cog",
-                    order: int.MaxValue - 1001,
-                    null,
-                    "_blank")
-                    );
-
-
-                context.Menu.Items.Add(new ApplicationMenuItem(
-                    "Account.Logout",
-                    l["Logout"],
-                    "~/Account/Logout",
-                    "fas fa-power-off",
-                    order: int.MaxValue - 1000
-                ));
-            }
+            context.Menu.Items.Add(new ApplicationMenuItem(
+                "Account.Manage",
+                l["ManageYourProfile"],
+                $"{_configuration["AuthServer:Authority"].EnsureEndsWith('/')}Account/Manage",
+                icon: "fa fa-cog",
+                order: int.MaxValue - 1001,
+                null,
+                "_blank"
+            ).RequireAuthenticated());
+
+
+            context.Menu.Items.Add(new ApplicationMenuItem(
+                "Account.Logout",
+                l["Logout"],
+                "~/Account/Logout",
+                "fas fa-power-off",
+                order: int.MaxValue - 1000
+            ).RequireAuthenticated());
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs
index d5d69405b6..7a11c7d73a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Menus/CmsKitAdminMenuContributor.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.GlobalFeatures;
 using Volo.Abp.UI.Navigation;
 using Volo.CmsKit.GlobalFeatures;
@@ -29,67 +30,46 @@ namespace Volo.CmsKit.Admin.Web.Menus
             var l = context.GetLocalizer<CmsKitResource>();
 
             var cmsMenus = new List<ApplicationMenuItem>();
-            
-            if (GlobalFeatureManager.Instance.IsEnabled<PagesFeature>())
-            {
-                if (await context.IsGrantedAsync(CmsKitAdminPermissions.Pages.Default))
-                {
-                    cmsMenus.Add(new ApplicationMenuItem(
-                        CmsKitAdminMenus.Pages.PagesMenu,
-                        l["Pages"].Value,
-                        "/Cms/Pages",
-                        "fa fa-file-alt"));
-                }
-            }
-            
-            if (GlobalFeatureManager.Instance.IsEnabled<BlogsFeature>())
-            {
-                if (await context.IsGrantedAsync(CmsKitAdminPermissions.Blogs.Default))
-                {
-                    cmsMenus.Add(new ApplicationMenuItem(
-                        CmsKitAdminMenus.Blogs.BlogsMenu,
-                        l["Blogs"],
-                        "/Cms/Blogs",
-                        "fa fa-blog"
-                    ));
-                }
 
-                if (await context.IsGrantedAsync(CmsKitAdminPermissions.BlogPosts.Default))
-                {
-                    cmsMenus.Add(new ApplicationMenuItem(
-                        CmsKitAdminMenus.BlogPosts.BlogPostsMenu,
-                        l["BlogPosts"],
-                        "/Cms/BlogPosts",
-                        "fa fa-file-signature"
-                    ));
-                }
-            }
-            
-            if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
-            {
-                if (await context.IsGrantedAsync(CmsKitAdminPermissions.Tags.Default))
-                {
-                    cmsMenus.Add(new ApplicationMenuItem(
-                        CmsKitAdminMenus.Tags.TagsMenu,
-                        l["Tags"].Value,
-                        "/Cms/Tags",
-                        "fa fa-tags"));
-                }
-            }
-            
-            if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>())
-            {
-                if (await context.IsGrantedAsync(CmsKitAdminPermissions.Comments.Default))
-                {
-                    cmsMenus.Add(new ApplicationMenuItem(
-                            CmsKitAdminMenus.Comments.CommentsMenu,
-                            l["Comments"].Value,
-                            "/Cms/Comments",
-                            "fa fa-comments"
-                        )
-                    );
-                }
-            }
+            cmsMenus.Add(new ApplicationMenuItem(
+                    CmsKitAdminMenus.Pages.PagesMenu,
+                    l["Pages"].Value,
+                    "/Cms/Pages",
+                    "fa fa-file-alt")
+                .RequireGlobalFeatures(typeof(PagesFeature))
+                .RequirePermissions(CmsKitAdminPermissions.Pages.Default));
+
+            cmsMenus.Add(new ApplicationMenuItem(
+                    CmsKitAdminMenus.Blogs.BlogsMenu,
+                    l["Blogs"],
+                    "/Cms/Blogs",
+                    "fa fa-blog")
+                .RequireGlobalFeatures(typeof(BlogsFeature))
+                .RequirePermissions(CmsKitAdminPermissions.Blogs.Default));
+
+            cmsMenus.Add(new ApplicationMenuItem(
+                    CmsKitAdminMenus.BlogPosts.BlogPostsMenu,
+                    l["BlogPosts"],
+                    "/Cms/BlogPosts",
+                    "fa fa-file-signature")
+                .RequireGlobalFeatures(typeof(BlogsFeature))
+                .RequirePermissions(CmsKitAdminPermissions.BlogPosts.Default));
+
+            cmsMenus.Add(new ApplicationMenuItem(
+                    CmsKitAdminMenus.Tags.TagsMenu,
+                    l["Tags"].Value,
+                    "/Cms/Tags",
+                    "fa fa-tags")
+                .RequireGlobalFeatures(typeof(TagsFeature))
+                .RequirePermissions(CmsKitAdminPermissions.Tags.Default));
+
+            cmsMenus.Add(new ApplicationMenuItem(
+                    CmsKitAdminMenus.Comments.CommentsMenu,
+                    l["Comments"].Value,
+                    "/Cms/Comments",
+                    "fa fa-comments")
+                .RequireGlobalFeatures(typeof(CommentsFeature))
+                .RequirePermissions(CmsKitAdminPermissions.Comments.Default));
 
             if (cmsMenus.Any())
             {
@@ -112,4 +92,4 @@ namespace Volo.CmsKit.Admin.Web.Menus
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
index e651e54f04..fafa8eac9b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
@@ -27,7 +27,6 @@ namespace Volo.Abp.Identity.Blazor
                     l["Roles"],
                     url: "~/identity/roles").RequirePermissions(IdentityPermissions.Roles.Default));
 
-
             identityMenuItem.AddItem(new ApplicationMenuItem(
                 IdentityMenuNames.Users,
                 l["Users"],
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Menus/MyProjectNameMenuContributor.cs
index 52a15ed4b2..26ad3a6a4d 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Menus/MyProjectNameMenuContributor.cs
@@ -6,6 +6,7 @@ using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp.Account.Localization;
 using Volo.Abp.Identity.Blazor;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.SettingManagement.Blazor.Menus;
 using Volo.Abp.TenantManagement.Blazor.Navigation;
 using Volo.Abp.UI.Navigation;
@@ -69,16 +70,11 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered.Menus
         {
             var l = context.GetLocalizer<MyProjectNameResource>();
             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, "_blank"));
-                context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
-            }
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["ManageYourProfile"],
+                    $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}", icon: "fa fa-cog", order: 1000, null, "_blank").RequireAuthenticated());
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000).RequireAuthenticated());
 
             return Task.CompletedTask;
         }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
index c42223526a..f8a0f7e509 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.Account.Localization;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.Users;
 
@@ -50,20 +51,16 @@ namespace MyCompanyName.MyProjectName.Blazor.Menus
         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));
-            }
+            context.Menu.AddItem(new ApplicationMenuItem(
+                "Account.Manage",
+                accountStringLocalizer["ManageYourProfile"],
+                $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}",
+                icon: "fa fa-cog",
+                order: 1000,
+                null).RequireAuthenticated());
 
             return Task.CompletedTask;
         }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs
index 5bf2fc404f..90fb5595ed 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp.Account.Localization;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Identity.Web.Navigation;
 using Volo.Abp.SettingManagement.Web.Navigation;
 using Volo.Abp.TenantManagement.Web.Navigation;
@@ -69,16 +70,11 @@ namespace MyCompanyName.MyProjectName.Web.Menus
         {
             var l = context.GetLocalizer<MyProjectNameResource>();
             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, "_blank"));
-                context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));
-            }
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["ManageYourProfile"],
+                $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}", icon: "fa fa-cog", order: 1000, null, "_blank").RequireAuthenticated());
+            context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000).RequireAuthenticated());
 
             return Task.CompletedTask;
         }
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostMenuContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostMenuContributor.cs
index c1151363ab..ef27052921 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostMenuContributor.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostMenuContributor.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.Users;
 
@@ -31,30 +32,25 @@ namespace MyCompanyName.MyProjectName
 
         private void AddLogoutItemToMenu(MenuConfigurationContext context)
         {
-            var currentUser = context.ServiceProvider.GetRequiredService<ICurrentUser>();
             var l = context.GetLocalizer<MyProjectNameResource>();
 
-            if (currentUser.IsAuthenticated)
-            {
-                context.Menu.Items.Add(new ApplicationMenuItem(
-                    "Account.Manage",
-                    l["ManageYourProfile"],
-                    $"{_configuration["AuthServer:Authority"].EnsureEndsWith('/')}Account/Manage",
-                    icon: "fa fa-cog",
-                    order: int.MaxValue - 1001,
-                    null,
-                    "_blank")
-                    );
-
-
-                context.Menu.Items.Add(new ApplicationMenuItem(
-                    "Account.Logout",
-                    l["Logout"],
-                    "~/Account/Logout",
-                    "fas fa-power-off",
-                    order: int.MaxValue - 1000
-                ));
-            }
+            context.Menu.Items.Add(new ApplicationMenuItem(
+                "Account.Manage",
+                l["ManageYourProfile"],
+                $"{_configuration["AuthServer:Authority"].EnsureEndsWith('/')}Account/Manage",
+                icon: "fa fa-cog",
+                order: int.MaxValue - 1001,
+                null,
+                "_blank"
+            ).RequireAuthenticated());
+
+            context.Menu.Items.Add(new ApplicationMenuItem(
+                "Account.Logout",
+                l["Logout"],
+                "~/Account/Logout",
+                "fas fa-power-off",
+                order: int.MaxValue - 1000
+            ).RequireAuthenticated());
         }
     }
 }