diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
index 3d3dd26fae..e4767cc031 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
@@ -1,13 +1,22 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Authentication
 @using Volo.Abp.Users
+@using Volo.Abp.MultiTenancy
 @inject ICurrentUser CurrentUser
+@inject ICurrentTenant CurrentTenant
 @inject NavigationManager Navigation
 @inject SignOutSessionStateManager SignOutManager
 <AuthorizeView>
     <Authorized>
         <Dropdown>
             <DropdownToggle Color="Color.None">
-                @CurrentUser.UserName
+                @if (CurrentTenant.Name != null)
+                {
+                    <span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span>
+                }
+                else
+                {
+                    <span>@CurrentUser.UserName</span>
+                }
             </DropdownToggle>
             <DropdownMenu>
                 @if (Menu != null)