diff --git a/src/app/menu/headertoolbar.component.html b/src/app/menu/headertoolbar.component.html
index 72e1f6395..ea8d437e3 100644
--- a/src/app/menu/headertoolbar.component.html
+++ b/src/app/menu/headertoolbar.component.html
@@ -44,6 +44,16 @@
 
   <span flex style="flex-grow: 1"></span>
 
+  <div *ngIf="username" class="mainMenu">
+    <span
+      data-testid="header-username"
+      style="display: inline-block; margin-top: 4px; color: #fff; font-size: 15px;"
+    >
+      {{ username }}
+    </span>
+    <p class="mainMenuDesc">Logged in as</p>
+  </div>
+
   <div class="mainMenu">
     <a mat-button routerLink="/help">
       <mat-icon svgIcon="help-circle"></mat-icon>
diff --git a/src/app/menu/headertoolbar.component.spec.ts b/src/app/menu/headertoolbar.component.spec.ts
new file mode 100644
index 000000000..82bfbccdc
--- /dev/null
+++ b/src/app/menu/headertoolbar.component.spec.ts
@@ -0,0 +1,78 @@
+// --------- BEGIN RUNBOX LICENSE ---------
+// Copyright (C) 2016-2026 Runbox Solutions AS (runbox.com).
+//
+// This file is part of Runbox 7.
+//
+// Runbox 7 is free software: You can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation, either version 3 of the License, or (at your
+// option) any later version.
+//
+// Runbox 7 is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Runbox 7. If not, see <https://www.gnu.org/licenses/>.
+// ---------- END RUNBOX LICENSE ----------
+
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { of } from 'rxjs';
+
+import { HeaderToolbarComponent } from './headertoolbar.component';
+import { RunboxWebmailAPI } from '../rmmapi/rbwebmail';
+import { RMMOfflineService } from '../rmmapi/rmmoffline.service';
+import { LogoutService } from '../login/logout.service';
+
+describe('HeaderToolbarComponent', () => {
+    let fixture: ComponentFixture<HeaderToolbarComponent>;
+    let component: HeaderToolbarComponent;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            declarations: [HeaderToolbarComponent],
+            imports: [RouterTestingModule],
+            providers: [
+                {
+                    provide: RunboxWebmailAPI,
+                    useValue: {
+                        me: of({
+                            username: 'alice',
+                            is_trial: false,
+                            owner: null,
+                        }),
+                    },
+                },
+                {
+                    provide: RMMOfflineService,
+                    useValue: {
+                        is_offline: false,
+                    },
+                },
+                {
+                    provide: LogoutService,
+                    useValue: {
+                        logout: jasmine.createSpy('logout'),
+                    },
+                },
+            ],
+            schemas: [NO_ERRORS_SCHEMA],
+        }).compileComponents();
+    });
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(HeaderToolbarComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should display the logged-in username in the app header', () => {
+        const usernameElement = fixture.nativeElement.querySelector('[data-testid="header-username"]');
+
+        expect(component.username).toBe('alice');
+        expect(usernameElement?.textContent).toContain('alice');
+    });
+});
diff --git a/src/app/menu/headertoolbar.component.ts b/src/app/menu/headertoolbar.component.ts
index ae584a1f3..859ea2e33 100644
--- a/src/app/menu/headertoolbar.component.ts
+++ b/src/app/menu/headertoolbar.component.ts
@@ -22,7 +22,6 @@ import { RunboxWebmailAPI } from '../rmmapi/rbwebmail';
 import { RMMOfflineService } from '../rmmapi/rmmoffline.service';
 import { Router } from '@angular/router';
 import { LogoutService } from '../login/logout.service';
-import { RunboxMe } from '../rmmapi/rbwebmail';
 
 @Component({
     // eslint-disable-next-line @angular-eslint/component-selector
@@ -34,22 +33,21 @@ export class HeaderToolbarComponent implements OnInit {
     rmm6tooltip = 'This area isn\'t upgraded to Runbox 7 yet and will open in a new tab';
     user_is_trial = false;
     isMainAccount: boolean;
+    username: string;
 
     constructor(
         public rmmapi: RunboxWebmailAPI,
         public rmmoffline: RMMOfflineService,
         private router: Router,
         public logoutservice: LogoutService
-    ) {
-         rmmapi.me.subscribe((me: RunboxMe) => {
-         this.isMainAccount = !me.owner;
-        });
-    }
+    ) { }
 
     ngOnInit() {
         this.rmmapi.me.subscribe(me => {
-           this.user_is_trial = me.is_trial;
-      });
+            this.user_is_trial = me.is_trial;
+            this.isMainAccount = !me.owner;
+            this.username = me.username;
+        });
     }
 
     public mailtable() {