diff --git a/apps/server/AliasVault.Admin/Main/Pages/Account/ManageLayout.razor b/apps/server/AliasVault.Admin/Main/Pages/Account/ManageLayout.razor
index 7dd2f7a29..0af47a9b3 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Account/ManageLayout.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Account/ManageLayout.razor
@@ -29,8 +29,6 @@
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-
-        // Add base breadcrumbs.
-        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Home", Url = "/" });
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Manage account" });
     }
 }
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor
index bafb6ee0c..563e54ba9 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Dashboard/AllTimeStats.razor
@@ -266,6 +266,8 @@
     {
         await base.OnInitializedAsync();
 
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "All-Time Statistics" });
+
         // Load statistics asynchronously for better perceived performance
         _ = LoadBasicStatisticsAsync();
         _ = LoadDetailedStatisticsAsync();
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Emails.razor b/apps/server/AliasVault.Admin/Main/Pages/Emails.razor
index a6744c12d..6861dea6c 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Emails.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Emails.razor
@@ -110,6 +110,13 @@ else
         await RefreshData();
     }
 
+    /// <inheritdoc />
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Emails" });
+    }
+
     /// <inheritdoc />
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -120,7 +127,7 @@ else
             {
                 _searchTerm = SearchTermFromQuery;
             }
-            
+
             await RefreshData();
         }
     }
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor b/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor
index 9c8c6dcec..eec295568 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Logging/Auth.razor
@@ -157,6 +157,8 @@ else
     {
         await base.OnInitializedAsync();
 
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Auth logs" });
+
         Navigation.LocationChanged += OnLocationChanged;
         ParseQueryAndRefresh();
         await RefreshData();
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor b/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor
index b24afae22..3d1114525 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Logging/General.razor
@@ -141,6 +141,13 @@ else
         await RefreshData();
     }
 
+    /// <inheritdoc />
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "General logs" });
+    }
+
     /// <inheritdoc />
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor b/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor
index c7eb05f7b..79ed9fbca 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Settings/Server.razor
@@ -117,6 +117,9 @@
     /// <inheritdoc/>
     protected override async Task OnInitializedAsync()
     {
+        await base.OnInitializedAsync();
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Server settings" });
+
         Settings = await SettingsService.GetAllSettingsAsync();
     }
 
diff --git a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor
index 241f438fd..e25ac817d 100644
--- a/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor
+++ b/apps/server/AliasVault.Admin/Main/Pages/Users/Users.razor
@@ -115,6 +115,13 @@ else
         await RefreshData();
     }
 
+    /// <inheritdoc />
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+        BreadcrumbItems.Add(new BreadcrumbItem { DisplayName = "Users" });
+    }
+
     /// <inheritdoc />
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
diff --git a/apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razor b/apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razor
index 82bcc9b0e..725c11864 100644
--- a/apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razor
+++ b/apps/server/Shared/AliasVault.RazorComponents/Headings/Breadcrumb.razor
@@ -40,10 +40,10 @@
     public List<BreadcrumbItem> BreadcrumbItems { get; set; } = new();
 
     /// <inheritdoc />
-    protected override void OnInitialized()
+    protected override void OnParametersSet()
     {
-        base.OnInitialized();
-        // Remove first item if it is the home page
+        base.OnParametersSet();
+        // Remove first item if it is the home page to avoid showing "Home > Home"
         if (BreadcrumbItems.Any() && BreadcrumbItems[0].DisplayName == "Home")
         {
             BreadcrumbItems.RemoveAt(0);