From ba210fdd9cab5c2d4497fef76155fae56149b67f Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 15:50:59 +0100
Subject: [PATCH 01/14] API proposal.

---
 .../Web/src/Forms/DisplayNameLabel.cs         | 79 +++++++++++++++++++
 .../Web/src/PublicAPI.Unshipped.txt           |  8 ++
 2 files changed, 87 insertions(+)
 create mode 100644 src/Components/Web/src/Forms/DisplayNameLabel.cs

diff --git a/src/Components/Web/src/Forms/DisplayNameLabel.cs b/src/Components/Web/src/Forms/DisplayNameLabel.cs
new file mode 100644
index 000000000000..59e52c297fe8
--- /dev/null
+++ b/src/Components/Web/src/Forms/DisplayNameLabel.cs
@@ -0,0 +1,79 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace Microsoft.AspNetCore.Components.Forms;
+
+/// <summary>
+/// Displays the display name for a specified field, reading from <see cref="DisplayAttribute"/>
+/// or <see cref="DisplayNameAttribute"/> if present, or falling back to the property name.
+/// </summary>
+/// <typeparam name="TValue">The type of the field.</typeparam>
+public class DisplayNameLabel<TValue> : ComponentBase
+{
+    private Expression<Func<TValue>>? _previousFieldAccessor;
+    private string? _displayName;
+
+    /// <summary>
+    /// Gets or sets a collection of additional attributes that will be applied to the created element.
+    /// </summary>
+    [Parameter(CaptureUnmatchedValues = true)]
+    public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
+
+    /// <summary>
+    /// Specifies the field for which the display name should be shown.
+    /// </summary>
+    [Parameter, EditorRequired]
+    public Expression<Func<TValue>>? For { get; set; }
+
+    /// <inheritdoc />
+    protected override void OnParametersSet()
+    {
+        if (For == null)
+        {
+            throw new InvalidOperationException($"{GetType()} requires a value for the " +
+                $"{nameof(For)} parameter.");
+        }
+
+        if (For != _previousFieldAccessor)
+        {
+            _displayName = GetDisplayName(For);
+            _previousFieldAccessor = For;
+        }
+    }
+
+    /// <inheritdoc />
+    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    {
+        builder.AddContent(0, _displayName);
+    }
+
+    private static string GetDisplayName(Expression<Func<TValue>> expression)
+    {
+        if (expression.Body is MemberExpression memberExpression)
+        {
+            var member = memberExpression.Member;
+
+            var displayAttribute = member.GetCustomAttribute<DisplayAttribute>();
+            if (displayAttribute?.Name != null)
+            {
+                return displayAttribute.Name;
+            }
+
+            var displayNameAttribute = member.GetCustomAttribute<DisplayNameAttribute>();
+            if (displayNameAttribute?.DisplayName != null)
+            {
+                return displayNameAttribute.DisplayName;
+            }
+
+            return member.Name;
+        }
+
+        return string.Empty;
+    }
+}
diff --git a/src/Components/Web/src/PublicAPI.Unshipped.txt b/src/Components/Web/src/PublicAPI.Unshipped.txt
index 369f33715778..84b2e7fd2bad 100644
--- a/src/Components/Web/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Web/src/PublicAPI.Unshipped.txt
@@ -40,3 +40,11 @@ Microsoft.AspNetCore.Components.Web.Media.MediaSource.MediaSource(byte[]! data,
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.MediaSource(System.IO.Stream! stream, string! mimeType, string! cacheKey) -> void
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.MimeType.get -> string!
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.Stream.get -> System.IO.Stream!
+Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>
+Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.AdditionalAttributes.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
+Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.AdditionalAttributes.set -> void
+Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.DisplayNameLabel() -> void
+Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.For.get -> System.Linq.Expressions.Expression<System.Func<TValue>!>?
+Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.For.set -> void
+override Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
+override Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.OnParametersSet() -> void

From 46795d55ceddd9d6bae8c0766c5dc38c2683065a Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 15:51:13 +0100
Subject: [PATCH 02/14] Unit tests.

---
 .../Web/test/Forms/DisplayNameLabelTest.cs    | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 src/Components/Web/test/Forms/DisplayNameLabelTest.cs

diff --git a/src/Components/Web/test/Forms/DisplayNameLabelTest.cs b/src/Components/Web/test/Forms/DisplayNameLabelTest.cs
new file mode 100644
index 000000000000..d2d12aafee1c
--- /dev/null
+++ b/src/Components/Web/test/Forms/DisplayNameLabelTest.cs
@@ -0,0 +1,206 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.Test.Helpers;
+
+namespace Microsoft.AspNetCore.Components.Forms;
+
+public class DisplayNameLabelTest
+{
+    [Fact]
+    public async Task ThrowsIfNoForParameterProvided()
+    {
+        // Arrange
+        var rootComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.CloseComponent();
+            }
+        };
+
+        var testRenderer = new TestRenderer();
+        var componentId = testRenderer.AssignRootComponentId(rootComponent);
+
+        // Act & Assert
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(
+            async () => await testRenderer.RenderRootComponentAsync(componentId));
+        Assert.Contains("For", ex.Message);
+        Assert.Contains("parameter", ex.Message);
+    }
+
+    [Fact]
+    public async Task DisplaysPropertyNameWhenNoAttributePresent()
+    {
+        // Arrange
+        var model = new TestModel();
+        var rootComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PlainProperty));
+                builder.CloseComponent();
+            }
+        };
+
+        // Act
+        var output = await RenderAndGetOutput(rootComponent);
+
+        // Assert
+        Assert.Equal("PlainProperty", output);
+    }
+
+    [Fact]
+    public async Task DisplaysDisplayAttributeName()
+    {
+        // Arrange
+        var model = new TestModel();
+        var rootComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithDisplayAttribute));
+                builder.CloseComponent();
+            }
+        };
+
+        // Act
+        var output = await RenderAndGetOutput(rootComponent);
+
+        // Assert
+        Assert.Equal("Custom Display Name", output);
+    }
+
+    [Fact]
+    public async Task DisplaysDisplayNameAttributeName()
+    {
+        // Arrange
+        var model = new TestModel();
+        var rootComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithDisplayNameAttribute));
+                builder.CloseComponent();
+            }
+        };
+
+        // Act
+        var output = await RenderAndGetOutput(rootComponent);
+
+        // Assert
+        Assert.Equal("Custom DisplayName", output);
+    }
+
+    [Fact]
+    public async Task DisplayAttributeTakesPrecedenceOverDisplayNameAttribute()
+    {
+        // Arrange
+        var model = new TestModel();
+        var rootComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithBothAttributes));
+                builder.CloseComponent();
+            }
+        };
+
+        // Act
+        var output = await RenderAndGetOutput(rootComponent);
+
+        // Assert
+        // DisplayAttribute should take precedence per MVC conventions
+        Assert.Equal("Display Takes Precedence", output);
+    }
+
+    [Fact]
+    public async Task WorksWithDifferentPropertyTypes()
+    {
+        // Arrange
+        var model = new TestModel();
+        var intComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<int>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<int>>)(() => model.IntProperty));
+                builder.CloseComponent();
+            }
+        };
+        var dateComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayNameLabel<DateTime>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<DateTime>>)(() => model.DateProperty));
+                builder.CloseComponent();
+            }
+        };
+
+        // Act
+        var intOutput = await RenderAndGetOutput(intComponent);
+        var dateOutput = await RenderAndGetOutput(dateComponent);
+
+        // Assert
+        Assert.Equal("Integer Value", intOutput);
+        Assert.Equal("Date Value", dateOutput);
+    }
+
+    private static async Task<string> RenderAndGetOutput(TestHostComponent rootComponent)
+    {
+        var testRenderer = new TestRenderer();
+        var componentId = testRenderer.AssignRootComponentId(rootComponent);
+        await testRenderer.RenderRootComponentAsync(componentId);
+
+        var batch = testRenderer.Batches.Single();
+        var displayLabelComponentFrame = batch.ReferenceFrames
+            .First(f => f.FrameType == RenderTree.RenderTreeFrameType.Component &&
+                       f.Component is DisplayNameLabel<string> or DisplayNameLabel<int> or DisplayNameLabel<DateTime>);
+
+        // Find the text content frame within the component
+        var textFrame = batch.ReferenceFrames
+            .First(f => f.FrameType == RenderTree.RenderTreeFrameType.Text);
+
+        return textFrame.TextContent;
+    }
+
+    private class TestHostComponent : ComponentBase
+    {
+        public RenderFragment InnerContent { get; set; }
+
+        protected override void BuildRenderTree(RenderTreeBuilder builder)
+        {
+            InnerContent(builder);
+        }
+    }
+
+    private class TestModel
+    {
+        public string PlainProperty { get; set; } = string.Empty;
+
+        [Display(Name = "Custom Display Name")]
+        public string PropertyWithDisplayAttribute { get; set; } = string.Empty;
+
+        [DisplayName("Custom DisplayName")]
+        public string PropertyWithDisplayNameAttribute { get; set; } = string.Empty;
+
+        [Display(Name = "Display Takes Precedence")]
+        [DisplayName("This Should Not Be Used")]
+        public string PropertyWithBothAttributes { get; set; } = string.Empty;
+
+        [Display(Name = "Integer Value")]
+        public int IntProperty { get; set; }
+
+        [Display(Name = "Date Value")]
+        public DateTime DateProperty { get; set; }
+    }
+}

From a16749751da5f9983ea4ca03689374536b80a0ea Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 16:12:18 +0100
Subject: [PATCH 03/14] Add E2E tests.

---
 .../test/E2ETest/Tests/FormsTest.cs           | 22 ++++++++++++++
 .../FormsTest/DisplayNameLabelComponent.razor | 30 +++++++++++++++++++
 .../test/testassets/BasicTestApp/Index.razor  |  1 +
 3 files changed, 53 insertions(+)
 create mode 100644 src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor

diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs
index b58dee62cf0b..c921368b1c9c 100644
--- a/src/Components/test/E2ETest/Tests/FormsTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsTest.cs
@@ -555,6 +555,28 @@ public void ErrorsFromCompareAttribute()
         Browser.Empty(confirmEmailValidationMessage);
     }
 
+    [Fact]
+    public void DisplayNameLabelReadsAttributesCorrectly()
+    {
+        var appElement = Browser.MountTestComponent<DisplayNameLabelComponent>();
+
+        // Check that DisplayAttribute.Name is displayed
+        var displayNameLabel = appElement.FindElement(By.Id("product-name-label"));
+        Browser.Equal("Product Name", () => displayNameLabel.Text);
+
+        // Check that DisplayNameAttribute is displayed
+        var priceLabel = appElement.FindElement(By.Id("price-label"));
+        Browser.Equal("Unit Price", () => priceLabel.Text);
+
+        // Check that DisplayAttribute takes precedence over DisplayNameAttribute
+        var stockLabel = appElement.FindElement(By.Id("stock-label"));
+        Browser.Equal("Stock Quantity", () => stockLabel.Text);
+
+        // Check fallback to property name when no attributes present
+        var descriptionLabel = appElement.FindElement(By.Id("description-label"));
+        Browser.Equal("Description", () => descriptionLabel.Text);
+    }
+
     [Fact]
     public void InputComponentsCauseContainerToRerenderOnChange()
     {
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor
new file mode 100644
index 000000000000..0909755d0924
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor
@@ -0,0 +1,30 @@
+@using System.ComponentModel
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Components.Forms
+
+<div>
+    <p id="product-name-label"><DisplayNameLabel For="@(() => _product.Name)" /></p>
+    <p id="price-label"><DisplayNameLabel For="@(() => _product.Price)" /></p>
+    <p id="stock-label"><DisplayNameLabel For="@(() => _product.StockQuantity)" /></p>
+    <p id="description-label"><DisplayNameLabel For="@(() => _product.Description)" /></p>
+</div>
+
+@code {
+    private Product _product = new Product();
+
+    class Product
+    {
+        [Display(Name = "Product Name")]
+        public string Name { get; set; } = "Sample";
+
+        [DisplayName("Unit Price")]
+        public decimal Price { get; set; } = 99.99m;
+
+        [Display(Name = "Stock Quantity")]
+        [DisplayName("Stock Amount")] // This should be ignored, Display takes precedence
+        public int StockQuantity { get; set; } = 100;
+
+        // No attributes - should fall back to property name
+        public string Description { get; set; } = "Test";
+    }
+}
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index f9cc718f7ca1..e38d57b7b6a5 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -52,6 +52,7 @@
         <option value="BasicTestApp.MediaTest.VideoTestComponent">Video component tests</option>
         <option value="BasicTestApp.MediaTest.FileDownloadTestComponent">File download component tests</option>
         <option value="BasicTestApp.FormsTest.TypicalValidationComponentUsingExperimentalValidator">Typical validation using experimental validator</option>
+        <option value="BasicTestApp.FormsTest.DisplayNameLabelComponent">DisplayNameLabel component</option>
         <option value="BasicTestApp.FormsTest.ValidationComponentDI">Validation with Dependency Injection</option>
         <option value="BasicTestApp.FormsTest.InputFileComponent">Input file</option>
         <option value="BasicTestApp.FormsTest.InputRangeComponent">Input range</option>

From 60aa7f7e134bd11000b2a44354fa36c10aba04f3 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 16:27:22 +0100
Subject: [PATCH 04/14] Alphabetically.

---
 src/Components/test/testassets/BasicTestApp/Index.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index e38d57b7b6a5..6a31bdddf352 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -27,6 +27,7 @@
         <option value="BasicTestApp.CustomElementsComponent">Custom elements</option>
         <option value="BasicTestApp.DataDashComponent">data-* attribute rendering</option>
         <option value="BasicTestApp.DispatchingComponent">Dispatching to sync context</option>
+        <option value="BasicTestApp.FormsTest.DisplayNameLabelComponent">DisplayNameLabel component</option>
         <option value="BasicTestApp.DuplicateAttributesComponent">Duplicate attributes</option>
         <option value="BasicTestApp.DynamicComponentRendering">DynamicComponent rendering</option>
         <option value="BasicTestApp.ElementFocusComponent">Element focus component</option>
@@ -52,7 +53,6 @@
         <option value="BasicTestApp.MediaTest.VideoTestComponent">Video component tests</option>
         <option value="BasicTestApp.MediaTest.FileDownloadTestComponent">File download component tests</option>
         <option value="BasicTestApp.FormsTest.TypicalValidationComponentUsingExperimentalValidator">Typical validation using experimental validator</option>
-        <option value="BasicTestApp.FormsTest.DisplayNameLabelComponent">DisplayNameLabel component</option>
         <option value="BasicTestApp.FormsTest.ValidationComponentDI">Validation with Dependency Injection</option>
         <option value="BasicTestApp.FormsTest.InputFileComponent">Input file</option>
         <option value="BasicTestApp.FormsTest.InputRangeComponent">Input range</option>

From db4d8afbf7a922957c9e180ecb0229534b3e64df Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 16:55:58 +0100
Subject: [PATCH 05/14] Update templates to use the new feature.

---
 .../Account/Pages/ForgotPassword.razor         |  5 ++++-
 .../Components/Account/Pages/Login.razor       | 14 ++++++++++----
 .../Account/Pages/Manage/ChangePassword.razor  | 12 +++++++++---
 .../Account/Pages/Manage/Email.razor           |  4 +++-
 .../Components/Account/Pages/Register.razor    | 12 +++++++++---
 .../Account/Pages/ResetPassword.razor          | 18 +++++++++++++-----
 6 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
index ae82692ab7e9..941efa5da4b1 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
@@ -25,7 +25,9 @@
 
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email" class="form-label">Email</label>
+                <label for="Input.Email" class="form-label">
+                    <DisplayNameLabel For="() => Input.Email" />
+                </label>
                 <ValidationMessage For="() => Input.Email" class="text-danger" />
             </div>
             <button type="submit" class="w-100 btn btn-lg btn-primary">Reset password</button>
@@ -69,6 +71,7 @@
     {
         [Required]
         [EmailAddress]
+        [Display(Name = "Email")]
         public string Email { get; set; } = "";
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
index 65347e0afdb6..6a4377362420 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
@@ -25,13 +25,17 @@
                 <ValidationSummary class="text-danger" role="alert" />
                 <div class="form-floating mb-3">
                     <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username webauthn" aria-required="true" placeholder="name@example.com" />
-                    <label for="Input.Email" class="form-label">Email</label>
+                    <label for="Input.Email" class="form-label">
+                        <DisplayNameLabel For="() => Input.Email" />
+                    </label>
                     <ValidationMessage For="() => Input.Email" class="text-danger" />
                 </div>
                 <div class="form-floating mb-3">
-                    <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
-                    <label for="Input.Password" class="form-label">Password</label>
-                    <ValidationMessage For="() => Input.Password" class="text-danger" />
+                <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
+                <label for="Input.Password" class="form-label">
+                    <DisplayNameLabel For="() => Input.Password" />
+                </label>
+                <ValidationMessage For="() => Input.Password" class="text-danger" />
                 </div>
                 <div class="checkbox mb-3">
                     <label class="form-label">
@@ -150,10 +154,12 @@
     {
         [Required]
         [EmailAddress]
+        [Display(Name = "Email")]
         public string Email { get; set; } = "";
 
         [Required]
         [DataType(DataType.Password)]
+        [Display(Name = "Password")]
         public string Password { get; set; } = "";
 
         [Display(Name = "Remember me?")]
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
index 290ea53d8fe1..457e35cba9db 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
@@ -20,17 +20,23 @@
             <ValidationSummary class="text-danger" role="alert" />
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.OldPassword" id="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Enter the old password" />
-                <label for="Input.OldPassword" class="form-label">Old password</label>
+                <label for="Input.OldPassword" class="form-label">
+                    <DisplayNameLabel For="() => Input.OldPassword" />
+                </label>
                 <ValidationMessage For="() => Input.OldPassword" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
-                <label for="Input.NewPassword" class="form-label">New password</label>
+                <label for="Input.NewPassword" class="form-label">
+                    <DisplayNameLabel For="() => Input.NewPassword" />
+                </label>
                 <ValidationMessage For="() => Input.NewPassword" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
-                <label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
+                <label for="Input.ConfirmPassword" class="form-label">
+                    <DisplayNameLabel For="() => Input.ConfirmPassword" />
+                </label>
                 <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
             </div>
             <button type="submit" class="w-100 btn btn-lg btn-primary">Update password</button>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
index 94f6b6a473ca..9fef6d049836 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
@@ -45,7 +45,9 @@
             }
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Enter a new email" />
-                <label for="Input.NewEmail" class="form-label">New email</label>
+                <label for="Input.NewEmail" class="form-label">
+                    <DisplayNameLabel For="() => Input.NewEmail" />
+                </label>
                 <ValidationMessage For="() => Input.NewEmail" class="text-danger" />
             </div>
             <button type="submit" class="w-100 btn btn-lg btn-primary">Change email</button>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
index bee8e0530a88..c03dae4e3c0b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
@@ -29,17 +29,23 @@
             <ValidationSummary class="text-danger" role="alert" />
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email">Email</label>
+                <label for="Input.Email">
+                    <DisplayNameLabel For="() => Input.Email" />
+                </label>
                 <ValidationMessage For="() => Input.Email" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
-                <label for="Input.Password">Password</label>
+                <label for="Input.Password">
+                    <DisplayNameLabel For="() => Input.Password" />
+                </label>
                 <ValidationMessage For="() => Input.Password" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
-                <label for="Input.ConfirmPassword">Confirm Password</label>
+                <label for="Input.ConfirmPassword" class="form-label">
+                    <DisplayNameLabel For="() => Input.ConfirmPassword" />
+                </label>
                 <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
             </div>
             <button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
index 74f258a1c518..256a1d210b9a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
@@ -24,17 +24,23 @@
             <input type="hidden" name="Input.Code" value="@Input.Code" />
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email" class="form-label">Email</label>
+                <label for="Input.Email" class="form-label">
+                    <DisplayNameLabel For="() => Input.Email" />
+                </label>
                 <ValidationMessage For="() => Input.Email" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please enter your password." />
-                <label for="Input.Password" class="form-label">Password</label>
+                <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
+                <label for="Input.Password" class="form-label">
+                    <DisplayNameLabel For="() => Input.Password" />
+                </label>
                 <ValidationMessage For="() => Input.Password" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please confirm your password." />
-                <label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
+                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
+                <label for="Input.ConfirmPassword" class="form-label">
+                    <DisplayNameLabel For="() => Input.ConfirmPassword" />
+                </label>
                 <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
             </div>
             <button type="submit" class="w-100 btn btn-lg btn-primary">Reset</button>
@@ -90,11 +96,13 @@
     {
         [Required]
         [EmailAddress]
+        [Display(Name = "Email")]
         public string Email { get; set; } = "";
 
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
+        [Display(Name = "Password")]
         public string Password { get; set; } = "";
 
         [DataType(DataType.Password)]

From 11da419d99033b15665746ce46725c2bd1399331 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 17:01:22 +0100
Subject: [PATCH 06/14] Cleanup.

---
 src/Components/Web/src/Forms/DisplayNameLabel.cs | 6 ------
 src/Components/Web/src/PublicAPI.Unshipped.txt   | 2 --
 2 files changed, 8 deletions(-)

diff --git a/src/Components/Web/src/Forms/DisplayNameLabel.cs b/src/Components/Web/src/Forms/DisplayNameLabel.cs
index 59e52c297fe8..f540e66822d7 100644
--- a/src/Components/Web/src/Forms/DisplayNameLabel.cs
+++ b/src/Components/Web/src/Forms/DisplayNameLabel.cs
@@ -19,12 +19,6 @@ public class DisplayNameLabel<TValue> : ComponentBase
     private Expression<Func<TValue>>? _previousFieldAccessor;
     private string? _displayName;
 
-    /// <summary>
-    /// Gets or sets a collection of additional attributes that will be applied to the created element.
-    /// </summary>
-    [Parameter(CaptureUnmatchedValues = true)]
-    public IReadOnlyDictionary<string, object>? AdditionalAttributes { get; set; }
-
     /// <summary>
     /// Specifies the field for which the display name should be shown.
     /// </summary>
diff --git a/src/Components/Web/src/PublicAPI.Unshipped.txt b/src/Components/Web/src/PublicAPI.Unshipped.txt
index 84b2e7fd2bad..45994f0684de 100644
--- a/src/Components/Web/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Web/src/PublicAPI.Unshipped.txt
@@ -41,8 +41,6 @@ Microsoft.AspNetCore.Components.Web.Media.MediaSource.MediaSource(System.IO.Stre
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.MimeType.get -> string!
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.Stream.get -> System.IO.Stream!
 Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>
-Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.AdditionalAttributes.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
-Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.AdditionalAttributes.set -> void
 Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.DisplayNameLabel() -> void
 Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.For.get -> System.Linq.Expressions.Expression<System.Func<TValue>!>?
 Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.For.set -> void

From 7bfb44c3fc27e85d6b9ae89a8f6b81eddcb4cc7f Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com>
Date: Wed, 3 Dec 2025 17:02:28 +0100
Subject: [PATCH 07/14] Update src/Components/Web/src/Forms/DisplayNameLabel.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/Components/Web/src/Forms/DisplayNameLabel.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/Web/src/Forms/DisplayNameLabel.cs b/src/Components/Web/src/Forms/DisplayNameLabel.cs
index f540e66822d7..729c8900058b 100644
--- a/src/Components/Web/src/Forms/DisplayNameLabel.cs
+++ b/src/Components/Web/src/Forms/DisplayNameLabel.cs
@@ -68,6 +68,9 @@ private static string GetDisplayName(Expression<Func<TValue>> expression)
             return member.Name;
         }
 
-        return string.Empty;
+        throw new ArgumentException(
+            $"The provided expression contains a {expression.Body.GetType().Name} which is not supported. " +
+            $"{nameof(DisplayNameLabel<TValue>)} only supports simple member accessors (fields, properties) of an object.",
+            nameof(expression));
     }
 }

From dc39fdcbd0d828af8cb94faff80655e96ed35b9f Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 17:11:05 +0100
Subject: [PATCH 08/14] Allign null operations.

---
 src/Components/Web/src/Forms/DisplayNameLabel.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Components/Web/src/Forms/DisplayNameLabel.cs b/src/Components/Web/src/Forms/DisplayNameLabel.cs
index 729c8900058b..8643f3cf1c7e 100644
--- a/src/Components/Web/src/Forms/DisplayNameLabel.cs
+++ b/src/Components/Web/src/Forms/DisplayNameLabel.cs
@@ -28,7 +28,7 @@ public class DisplayNameLabel<TValue> : ComponentBase
     /// <inheritdoc />
     protected override void OnParametersSet()
     {
-        if (For == null)
+        if (For is null)
         {
             throw new InvalidOperationException($"{GetType()} requires a value for the " +
                 $"{nameof(For)} parameter.");
@@ -54,13 +54,17 @@ private static string GetDisplayName(Expression<Func<TValue>> expression)
             var member = memberExpression.Member;
 
             var displayAttribute = member.GetCustomAttribute<DisplayAttribute>();
-            if (displayAttribute?.Name != null)
+            if (displayAttribute != null)
             {
-                return displayAttribute.Name;
+                var name = displayAttribute.GetName();
+                if (name != null)
+                {
+                    return name;
+                }
             }
 
             var displayNameAttribute = member.GetCustomAttribute<DisplayNameAttribute>();
-            if (displayNameAttribute?.DisplayName != null)
+            if (displayNameAttribute?.DisplayName is not null)
             {
                 return displayNameAttribute.DisplayName;
             }

From b048f80be9c51a69f21b20f24c9b0bf3fe1692f9 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 17:17:50 +0100
Subject: [PATCH 09/14] Feedback: remove `Label` from the name to avoid
 misunderstandings.

---
 .../{DisplayNameLabel.cs => DisplayName.cs}    |  4 ++--
 src/Components/Web/src/PublicAPI.Unshipped.txt | 12 ++++++------
 ...playNameLabelTest.cs => DisplayNameTest.cs} | 18 +++++++++---------
 src/Components/test/E2ETest/Tests/FormsTest.cs |  4 ++--
 ...ponent.razor => DisplayNameComponent.razor} |  8 ++++----
 .../test/testassets/BasicTestApp/Index.razor   |  2 +-
 .../Account/Pages/ForgotPassword.razor         |  2 +-
 .../Components/Account/Pages/Login.razor       |  4 ++--
 .../Account/Pages/Manage/ChangePassword.razor  |  6 +++---
 .../Account/Pages/Manage/Email.razor           |  2 +-
 .../Components/Account/Pages/Register.razor    |  6 +++---
 .../Account/Pages/ResetPassword.razor          |  6 +++---
 12 files changed, 37 insertions(+), 37 deletions(-)
 rename src/Components/Web/src/Forms/{DisplayNameLabel.cs => DisplayName.cs} (95%)
 rename src/Components/Web/test/Forms/{DisplayNameLabelTest.cs => DisplayNameTest.cs} (90%)
 rename src/Components/test/testassets/BasicTestApp/FormsTest/{DisplayNameLabelComponent.razor => DisplayNameComponent.razor} (67%)

diff --git a/src/Components/Web/src/Forms/DisplayNameLabel.cs b/src/Components/Web/src/Forms/DisplayName.cs
similarity index 95%
rename from src/Components/Web/src/Forms/DisplayNameLabel.cs
rename to src/Components/Web/src/Forms/DisplayName.cs
index 8643f3cf1c7e..6c9f3e81470e 100644
--- a/src/Components/Web/src/Forms/DisplayNameLabel.cs
+++ b/src/Components/Web/src/Forms/DisplayName.cs
@@ -14,9 +14,9 @@ namespace Microsoft.AspNetCore.Components.Forms;
 /// or <see cref="DisplayNameAttribute"/> if present, or falling back to the property name.
 /// </summary>
 /// <typeparam name="TValue">The type of the field.</typeparam>
-public class DisplayNameLabel<TValue> : ComponentBase
+public class DisplayName<TValue> : ComponentBase
 {
-    private Expression<Func<TValue>>? _previousFieldAccessor;
+  private Expression<Func<TValue>>? _previousFieldAccessor;
     private string? _displayName;
 
     /// <summary>
diff --git a/src/Components/Web/src/PublicAPI.Unshipped.txt b/src/Components/Web/src/PublicAPI.Unshipped.txt
index 45994f0684de..474d3774e6b8 100644
--- a/src/Components/Web/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Web/src/PublicAPI.Unshipped.txt
@@ -40,9 +40,9 @@ Microsoft.AspNetCore.Components.Web.Media.MediaSource.MediaSource(byte[]! data,
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.MediaSource(System.IO.Stream! stream, string! mimeType, string! cacheKey) -> void
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.MimeType.get -> string!
 Microsoft.AspNetCore.Components.Web.Media.MediaSource.Stream.get -> System.IO.Stream!
-Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>
-Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.DisplayNameLabel() -> void
-Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.For.get -> System.Linq.Expressions.Expression<System.Func<TValue>!>?
-Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.For.set -> void
-override Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
-override Microsoft.AspNetCore.Components.Forms.DisplayNameLabel<TValue>.OnParametersSet() -> void
+Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>
+Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.DisplayName() -> void
+Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.For.get -> System.Linq.Expressions.Expression<System.Func<TValue>!>?
+Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.For.set -> void
+override Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
+override Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.OnParametersSet() -> void
diff --git a/src/Components/Web/test/Forms/DisplayNameLabelTest.cs b/src/Components/Web/test/Forms/DisplayNameTest.cs
similarity index 90%
rename from src/Components/Web/test/Forms/DisplayNameLabelTest.cs
rename to src/Components/Web/test/Forms/DisplayNameTest.cs
index d2d12aafee1c..d41ddc547d8e 100644
--- a/src/Components/Web/test/Forms/DisplayNameLabelTest.cs
+++ b/src/Components/Web/test/Forms/DisplayNameTest.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.AspNetCore.Components.Forms;
 
-public class DisplayNameLabelTest
+public class DisplayNameTest
 {
     [Fact]
     public async Task ThrowsIfNoForParameterProvided()
@@ -18,7 +18,7 @@ public async Task ThrowsIfNoForParameterProvided()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.OpenComponent<DisplayName<string>>(0);
                 builder.CloseComponent();
             }
         };
@@ -42,7 +42,7 @@ public async Task DisplaysPropertyNameWhenNoAttributePresent()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.OpenComponent<DisplayName<string>>(0);
                 builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PlainProperty));
                 builder.CloseComponent();
             }
@@ -64,7 +64,7 @@ public async Task DisplaysDisplayAttributeName()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.OpenComponent<DisplayName<string>>(0);
                 builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithDisplayAttribute));
                 builder.CloseComponent();
             }
@@ -86,7 +86,7 @@ public async Task DisplaysDisplayNameAttributeName()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.OpenComponent<DisplayName<string>>(0);
                 builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithDisplayNameAttribute));
                 builder.CloseComponent();
             }
@@ -108,7 +108,7 @@ public async Task DisplayAttributeTakesPrecedenceOverDisplayNameAttribute()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<string>>(0);
+                builder.OpenComponent<DisplayName<string>>(0);
                 builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithBothAttributes));
                 builder.CloseComponent();
             }
@@ -131,7 +131,7 @@ public async Task WorksWithDifferentPropertyTypes()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<int>>(0);
+                builder.OpenComponent<DisplayName<int>>(0);
                 builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<int>>)(() => model.IntProperty));
                 builder.CloseComponent();
             }
@@ -140,7 +140,7 @@ public async Task WorksWithDifferentPropertyTypes()
         {
             InnerContent = builder =>
             {
-                builder.OpenComponent<DisplayNameLabel<DateTime>>(0);
+                builder.OpenComponent<DisplayName<DateTime>>(0);
                 builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<DateTime>>)(() => model.DateProperty));
                 builder.CloseComponent();
             }
@@ -164,7 +164,7 @@ private static async Task<string> RenderAndGetOutput(TestHostComponent rootCompo
         var batch = testRenderer.Batches.Single();
         var displayLabelComponentFrame = batch.ReferenceFrames
             .First(f => f.FrameType == RenderTree.RenderTreeFrameType.Component &&
-                       f.Component is DisplayNameLabel<string> or DisplayNameLabel<int> or DisplayNameLabel<DateTime>);
+                       f.Component is DisplayName<string> or DisplayName<int> or DisplayName<DateTime>);
 
         // Find the text content frame within the component
         var textFrame = batch.ReferenceFrames
diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs
index c921368b1c9c..966c9b642a81 100644
--- a/src/Components/test/E2ETest/Tests/FormsTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsTest.cs
@@ -556,9 +556,9 @@ public void ErrorsFromCompareAttribute()
     }
 
     [Fact]
-    public void DisplayNameLabelReadsAttributesCorrectly()
+    public void DisplayNameReadsAttributesCorrectly()
     {
-        var appElement = Browser.MountTestComponent<DisplayNameLabelComponent>();
+        var appElement = Browser.MountTestComponent<DisplayNameComponent>();
 
         // Check that DisplayAttribute.Name is displayed
         var displayNameLabel = appElement.FindElement(By.Id("product-name-label"));
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor
similarity index 67%
rename from src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor
rename to src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor
index 0909755d0924..f70da687f53d 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameLabelComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor
@@ -3,10 +3,10 @@
 @using Microsoft.AspNetCore.Components.Forms
 
 <div>
-    <p id="product-name-label"><DisplayNameLabel For="@(() => _product.Name)" /></p>
-    <p id="price-label"><DisplayNameLabel For="@(() => _product.Price)" /></p>
-    <p id="stock-label"><DisplayNameLabel For="@(() => _product.StockQuantity)" /></p>
-    <p id="description-label"><DisplayNameLabel For="@(() => _product.Description)" /></p>
+    <p id="product-name-label"><DisplayName For="@(() => _product.Name)" /></p>
+    <p id="price-label"><DisplayName For="@(() => _product.Price)" /></p>
+    <p id="stock-label"><DisplayName For="@(() => _product.StockQuantity)" /></p>
+    <p id="description-label"><DisplayName For="@(() => _product.Description)" /></p>
 </div>
 
 @code {
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index 6a31bdddf352..ec6bb63c489d 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -27,7 +27,7 @@
         <option value="BasicTestApp.CustomElementsComponent">Custom elements</option>
         <option value="BasicTestApp.DataDashComponent">data-* attribute rendering</option>
         <option value="BasicTestApp.DispatchingComponent">Dispatching to sync context</option>
-        <option value="BasicTestApp.FormsTest.DisplayNameLabelComponent">DisplayNameLabel component</option>
+        <option value="BasicTestApp.FormsTest.DisplayNameComponent">DisplayName component</option>
         <option value="BasicTestApp.DuplicateAttributesComponent">Duplicate attributes</option>
         <option value="BasicTestApp.DynamicComponentRendering">DynamicComponent rendering</option>
         <option value="BasicTestApp.ElementFocusComponent">Element focus component</option>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
index 941efa5da4b1..5176ea466380 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ForgotPassword.razor
@@ -26,7 +26,7 @@
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
                 <label for="Input.Email" class="form-label">
-                    <DisplayNameLabel For="() => Input.Email" />
+                    <DisplayName For="() => Input.Email" />
                 </label>
                 <ValidationMessage For="() => Input.Email" class="text-danger" />
             </div>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
index 6a4377362420..65157408b009 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Login.razor
@@ -26,14 +26,14 @@
                 <div class="form-floating mb-3">
                     <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username webauthn" aria-required="true" placeholder="name@example.com" />
                     <label for="Input.Email" class="form-label">
-                        <DisplayNameLabel For="() => Input.Email" />
+                        <DisplayName For="() => Input.Email" />
                     </label>
                     <ValidationMessage For="() => Input.Email" class="text-danger" />
                 </div>
                 <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
                 <label for="Input.Password" class="form-label">
-                    <DisplayNameLabel For="() => Input.Password" />
+                    <DisplayName For="() => Input.Password" />
                 </label>
                 <ValidationMessage For="() => Input.Password" class="text-danger" />
                 </div>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
index 457e35cba9db..0a47876de2ba 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/ChangePassword.razor
@@ -21,21 +21,21 @@
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.OldPassword" id="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Enter the old password" />
                 <label for="Input.OldPassword" class="form-label">
-                    <DisplayNameLabel For="() => Input.OldPassword" />
+                    <DisplayName For="() => Input.OldPassword" />
                 </label>
                 <ValidationMessage For="() => Input.OldPassword" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
                 <label for="Input.NewPassword" class="form-label">
-                    <DisplayNameLabel For="() => Input.NewPassword" />
+                    <DisplayName For="() => Input.NewPassword" />
                 </label>
                 <ValidationMessage For="() => Input.NewPassword" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
                 <label for="Input.ConfirmPassword" class="form-label">
-                    <DisplayNameLabel For="() => Input.ConfirmPassword" />
+                    <DisplayName For="() => Input.ConfirmPassword" />
                 </label>
                 <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
             </div>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
index 9fef6d049836..a2ca61841b0b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Manage/Email.razor
@@ -46,7 +46,7 @@
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Enter a new email" />
                 <label for="Input.NewEmail" class="form-label">
-                    <DisplayNameLabel For="() => Input.NewEmail" />
+                    <DisplayName For="() => Input.NewEmail" />
                 </label>
                 <ValidationMessage For="() => Input.NewEmail" class="text-danger" />
             </div>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
index c03dae4e3c0b..fe9296f4a474 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/Register.razor
@@ -30,21 +30,21 @@
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
                 <label for="Input.Email">
-                    <DisplayNameLabel For="() => Input.Email" />
+                    <DisplayName For="() => Input.Email" />
                 </label>
                 <ValidationMessage For="() => Input.Email" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
                 <label for="Input.Password">
-                    <DisplayNameLabel For="() => Input.Password" />
+                    <DisplayName For="() => Input.Password" />
                 </label>
                 <ValidationMessage For="() => Input.Password" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
                 <label for="Input.ConfirmPassword" class="form-label">
-                    <DisplayNameLabel For="() => Input.ConfirmPassword" />
+                    <DisplayName For="() => Input.ConfirmPassword" />
                 </label>
                 <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
             </div>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
index 256a1d210b9a..243d0f9d2177 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Account/Pages/ResetPassword.razor
@@ -25,21 +25,21 @@
             <div class="form-floating mb-3">
                 <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
                 <label for="Input.Email" class="form-label">
-                    <DisplayNameLabel For="() => Input.Email" />
+                    <DisplayName For="() => Input.Email" />
                 </label>
                 <ValidationMessage For="() => Input.Email" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
                 <label for="Input.Password" class="form-label">
-                    <DisplayNameLabel For="() => Input.Password" />
+                    <DisplayName For="() => Input.Password" />
                 </label>
                 <ValidationMessage For="() => Input.Password" class="text-danger" />
             </div>
             <div class="form-floating mb-3">
                 <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
                 <label for="Input.ConfirmPassword" class="form-label">
-                    <DisplayNameLabel For="() => Input.ConfirmPassword" />
+                    <DisplayName For="() => Input.ConfirmPassword" />
                 </label>
                 <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
             </div>

From ce68d5aa9a9be6729e9dcaffbd04dbae1945ff3f Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 17:43:21 +0100
Subject: [PATCH 10/14] Fix merge error

---
 src/Components/Web/src/Forms/DisplayName.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Web/src/Forms/DisplayName.cs b/src/Components/Web/src/Forms/DisplayName.cs
index 6c9f3e81470e..3e3d4c651603 100644
--- a/src/Components/Web/src/Forms/DisplayName.cs
+++ b/src/Components/Web/src/Forms/DisplayName.cs
@@ -74,7 +74,7 @@ private static string GetDisplayName(Expression<Func<TValue>> expression)
 
         throw new ArgumentException(
             $"The provided expression contains a {expression.Body.GetType().Name} which is not supported. " +
-            $"{nameof(DisplayNameLabel<TValue>)} only supports simple member accessors (fields, properties) of an object.",
+            $"{nameof(DisplayName<TValue>)} only supports simple member accessors (fields, properties) of an object.",
             nameof(expression));
     }
 }

From a8098f9f61aeb6a38c597523b4447bc1ba300a8b Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 17:58:44 +0100
Subject: [PATCH 11/14] Feedback: use same caching approach as
 `FieldIdentifier` uses.

---
 src/Components/Web/src/Forms/DisplayName.cs | 71 +++++++++++++++------
 1 file changed, 51 insertions(+), 20 deletions(-)

diff --git a/src/Components/Web/src/Forms/DisplayName.cs b/src/Components/Web/src/Forms/DisplayName.cs
index 3e3d4c651603..41d6df7734cd 100644
--- a/src/Components/Web/src/Forms/DisplayName.cs
+++ b/src/Components/Web/src/Forms/DisplayName.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq.Expressions;
@@ -14,9 +15,11 @@ namespace Microsoft.AspNetCore.Components.Forms;
 /// or <see cref="DisplayNameAttribute"/> if present, or falling back to the property name.
 /// </summary>
 /// <typeparam name="TValue">The type of the field.</typeparam>
-public class DisplayName<TValue> : ComponentBase
+public class DisplayName<TValue> : IComponent
 {
-  private Expression<Func<TValue>>? _previousFieldAccessor;
+    private static readonly ConcurrentDictionary<MemberInfo, string> _displayNameCache = new();
+
+    private RenderHandle _renderHandle;
     private string? _displayName;
 
     /// <summary>
@@ -25,56 +28,84 @@ public class DisplayName<TValue> : ComponentBase
     [Parameter, EditorRequired]
     public Expression<Func<TValue>>? For { get; set; }
 
+    static DisplayName()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
+    /// <inheritdoc />
+    public void Attach(RenderHandle renderHandle)
+    {
+        _renderHandle = renderHandle;
+    }
+
     /// <inheritdoc />
-    protected override void OnParametersSet()
+    public Task SetParametersAsync(ParameterView parameters)
     {
+        parameters.SetParameterProperties(this);
+
         if (For is null)
         {
             throw new InvalidOperationException($"{GetType()} requires a value for the " +
                 $"{nameof(For)} parameter.");
         }
 
-        if (For != _previousFieldAccessor)
+        var newDisplayName = GetDisplayName(For);
+
+        // Only re-render if the display name string has actually changed
+        if (newDisplayName != _displayName)
         {
-            _displayName = GetDisplayName(For);
-            _previousFieldAccessor = For;
+            _displayName = newDisplayName;
+            _renderHandle.Render(BuildRenderTree);
         }
+
+        return Task.CompletedTask;
     }
 
-    /// <inheritdoc />
-    protected override void BuildRenderTree(RenderTreeBuilder builder)
+    private void BuildRenderTree(RenderTreeBuilder builder)
     {
         builder.AddContent(0, _displayName);
     }
 
     private static string GetDisplayName(Expression<Func<TValue>> expression)
     {
-        if (expression.Body is MemberExpression memberExpression)
+        if (expression.Body is not MemberExpression memberExpression)
         {
-            var member = memberExpression.Member;
+            throw new ArgumentException(
+                $"The provided expression contains a {expression.Body.GetType().Name} which is not supported. " +
+                $"{nameof(DisplayName<TValue>)} only supports simple member accessors (fields, properties) of an object.",
+                nameof(expression));
+        }
 
-            var displayAttribute = member.GetCustomAttribute<DisplayAttribute>();
-            if (displayAttribute != null)
+        var member = memberExpression.Member;
+
+        return _displayNameCache.GetOrAdd(member, static m =>
+        {
+            var displayAttribute = m.GetCustomAttribute<DisplayAttribute>();
+            if (displayAttribute is not null)
             {
                 var name = displayAttribute.GetName();
-                if (name != null)
+                if (name is not null)
                 {
                     return name;
                 }
             }
 
-            var displayNameAttribute = member.GetCustomAttribute<DisplayNameAttribute>();
+            var displayNameAttribute = m.GetCustomAttribute<DisplayNameAttribute>();
             if (displayNameAttribute?.DisplayName is not null)
             {
                 return displayNameAttribute.DisplayName;
             }
 
-            return member.Name;
-        }
+            return m.Name;
+        });
+    }
 
-        throw new ArgumentException(
-            $"The provided expression contains a {expression.Body.GetType().Name} which is not supported. " +
-            $"{nameof(DisplayName<TValue>)} only supports simple member accessors (fields, properties) of an object.",
-            nameof(expression));
+    private static void ClearCache()
+    {
+        _displayNameCache.Clear();
     }
 }

From b6195cc9a760f0d31845039b1300522e9af34647 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 3 Dec 2025 18:20:25 +0100
Subject: [PATCH 12/14] Fix build.

---
 src/Components/Web/src/Forms/DisplayName.cs    | 5 +++--
 src/Components/Web/src/PublicAPI.Unshipped.txt | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Components/Web/src/Forms/DisplayName.cs b/src/Components/Web/src/Forms/DisplayName.cs
index 41d6df7734cd..95a81baf6d30 100644
--- a/src/Components/Web/src/Forms/DisplayName.cs
+++ b/src/Components/Web/src/Forms/DisplayName.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq.Expressions;
 using System.Reflection;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Rendering;
 
 namespace Microsoft.AspNetCore.Components.Forms;
@@ -37,13 +38,13 @@ static DisplayName()
     }
 
     /// <inheritdoc />
-    public void Attach(RenderHandle renderHandle)
+    void IComponent.Attach(RenderHandle renderHandle)
     {
         _renderHandle = renderHandle;
     }
 
     /// <inheritdoc />
-    public Task SetParametersAsync(ParameterView parameters)
+    Task IComponent.SetParametersAsync(ParameterView parameters)
     {
         parameters.SetParameterProperties(this);
 
diff --git a/src/Components/Web/src/PublicAPI.Unshipped.txt b/src/Components/Web/src/PublicAPI.Unshipped.txt
index 474d3774e6b8..9d7bb1b72c24 100644
--- a/src/Components/Web/src/PublicAPI.Unshipped.txt
+++ b/src/Components/Web/src/PublicAPI.Unshipped.txt
@@ -44,5 +44,3 @@ Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>
 Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.DisplayName() -> void
 Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.For.get -> System.Linq.Expressions.Expression<System.Func<TValue>!>?
 Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.For.set -> void
-override Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder! builder) -> void
-override Microsoft.AspNetCore.Components.Forms.DisplayName<TValue>.OnParametersSet() -> void

From dfec21337bd2f4a7775375770979e4c666974660 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 4 Dec 2025 13:31:42 +0100
Subject: [PATCH 13/14] Feedback: use the infrastructure from
 `ValidationMessage`.

---
 src/Components/Web/src/Forms/DisplayName.cs   | 31 +++++------
 .../Web/src/Forms/ExpressionMemberAccessor.cs | 54 +++++++++++++++++++
 2 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 src/Components/Web/src/Forms/ExpressionMemberAccessor.cs

diff --git a/src/Components/Web/src/Forms/DisplayName.cs b/src/Components/Web/src/Forms/DisplayName.cs
index 95a81baf6d30..964c71e2a67b 100644
--- a/src/Components/Web/src/Forms/DisplayName.cs
+++ b/src/Components/Web/src/Forms/DisplayName.cs
@@ -21,6 +21,7 @@ public class DisplayName<TValue> : IComponent
     private static readonly ConcurrentDictionary<MemberInfo, string> _displayNameCache = new();
 
     private RenderHandle _renderHandle;
+    private Expression<Func<TValue>>? _previousFieldAccessor;
     private string? _displayName;
 
     /// <summary>
@@ -54,13 +55,19 @@ Task IComponent.SetParametersAsync(ParameterView parameters)
                 $"{nameof(For)} parameter.");
         }
 
-        var newDisplayName = GetDisplayName(For);
-
-        // Only re-render if the display name string has actually changed
-        if (newDisplayName != _displayName)
+        // Only recalculate if the expression changed
+        if (For != _previousFieldAccessor)
         {
-            _displayName = newDisplayName;
-            _renderHandle.Render(BuildRenderTree);
+            var member = ExpressionMemberAccessor.GetMemberInfo(For);
+            var newDisplayName = GetDisplayName(member);
+
+            if (newDisplayName != _displayName)
+            {
+                _displayName = newDisplayName;
+                _renderHandle.Render(BuildRenderTree);
+            }
+
+            _previousFieldAccessor = For;
         }
 
         return Task.CompletedTask;
@@ -71,18 +78,8 @@ private void BuildRenderTree(RenderTreeBuilder builder)
         builder.AddContent(0, _displayName);
     }
 
-    private static string GetDisplayName(Expression<Func<TValue>> expression)
+    private static string GetDisplayName(MemberInfo member)
     {
-        if (expression.Body is not MemberExpression memberExpression)
-        {
-            throw new ArgumentException(
-                $"The provided expression contains a {expression.Body.GetType().Name} which is not supported. " +
-                $"{nameof(DisplayName<TValue>)} only supports simple member accessors (fields, properties) of an object.",
-                nameof(expression));
-        }
-
-        var member = memberExpression.Member;
-
         return _displayNameCache.GetOrAdd(member, static m =>
         {
             var displayAttribute = m.GetCustomAttribute<DisplayAttribute>();
diff --git a/src/Components/Web/src/Forms/ExpressionMemberAccessor.cs b/src/Components/Web/src/Forms/ExpressionMemberAccessor.cs
new file mode 100644
index 000000000000..89ee34d7582d
--- /dev/null
+++ b/src/Components/Web/src/Forms/ExpressionMemberAccessor.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Concurrent;
+using System.Linq.Expressions;
+using System.Reflection;
+using Microsoft.AspNetCore.Components.HotReload;
+
+namespace Microsoft.AspNetCore.Components.Forms;
+
+internal static class ExpressionMemberAccessor
+{
+    private static readonly ConcurrentDictionary<Expression, MemberInfo> _memberInfoCache = new();
+
+    static ExpressionMemberAccessor()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += ClearCache;
+        }
+    }
+
+    public static MemberInfo GetMemberInfo<TValue>(Expression<Func<TValue>> accessor)
+    {
+        ArgumentNullException.ThrowIfNull(accessor);
+
+        return _memberInfoCache.GetOrAdd(accessor, static expr =>
+        {
+            var lambdaExpression = (LambdaExpression)expr;
+            var accessorBody = lambdaExpression.Body;
+
+            if (accessorBody is UnaryExpression unaryExpression
+                && unaryExpression.NodeType == ExpressionType.Convert
+                && unaryExpression.Type == typeof(object))
+            {
+                accessorBody = unaryExpression.Operand;
+            }
+
+            if (accessorBody is not MemberExpression memberExpression)
+            {
+                throw new ArgumentException(
+                    $"The provided expression contains a {accessorBody.GetType().Name} which is not supported. " +
+                    $"Only simple member accessors (fields, properties) of an object are supported.");
+            }
+
+            return memberExpression.Member;
+        });
+    }
+
+    private static void ClearCache()
+    {
+        _memberInfoCache.Clear();
+    }
+}

From 5a4421ff046c761a6b521d930d913fd833c5d29e Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 4 Dec 2025 14:07:02 +0100
Subject: [PATCH 14/14] Feedback: Make sure localization is supported.

---
 .../Web/test/Forms/DisplayNameTest.cs         | 26 +++++++++++++++++++
 .../test/E2ETest/Tests/FormsTest.cs           |  4 +++
 .../FormsTest/DisplayNameComponent.razor      |  5 ++++
 .../testassets/BasicTestApp/Resources.fr.resx |  3 +++
 .../testassets/BasicTestApp/Resources.resx    |  3 +++
 .../testassets/BasicTestApp/TestResources.cs  | 11 ++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 src/Components/test/testassets/BasicTestApp/TestResources.cs

diff --git a/src/Components/Web/test/Forms/DisplayNameTest.cs b/src/Components/Web/test/Forms/DisplayNameTest.cs
index d41ddc547d8e..f7835c540827 100644
--- a/src/Components/Web/test/Forms/DisplayNameTest.cs
+++ b/src/Components/Web/test/Forms/DisplayNameTest.cs
@@ -155,6 +155,24 @@ public async Task WorksWithDifferentPropertyTypes()
         Assert.Equal("Date Value", dateOutput);
     }
 
+    [Fact]
+    public async Task SupportsLocalizationWithResourceType()
+    {
+        var model = new TestModel();
+        var rootComponent = new TestHostComponent
+        {
+            InnerContent = builder =>
+            {
+                builder.OpenComponent<DisplayName<string>>(0);
+                builder.AddComponentParameter(1, "For", (System.Linq.Expressions.Expression<Func<string>>)(() => model.PropertyWithResourceBasedDisplay));
+                builder.CloseComponent();
+            }
+        };
+
+        var output = await RenderAndGetOutput(rootComponent);
+        Assert.Equal("Localized Display Name", output);
+    }
+
     private static async Task<string> RenderAndGetOutput(TestHostComponent rootComponent)
     {
         var testRenderer = new TestRenderer();
@@ -202,5 +220,13 @@ private class TestModel
 
         [Display(Name = "Date Value")]
         public DateTime DateProperty { get; set; }
+
+        [Display(Name = nameof(TestResources.LocalizedDisplayName), ResourceType = typeof(TestResources))]
+        public string PropertyWithResourceBasedDisplay { get; set; } = string.Empty;
+    }
+
+    public static class TestResources
+    {
+        public static string LocalizedDisplayName => "Localized Display Name";
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs
index 966c9b642a81..304ea1721abc 100644
--- a/src/Components/test/E2ETest/Tests/FormsTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsTest.cs
@@ -575,6 +575,10 @@ public void DisplayNameReadsAttributesCorrectly()
         // Check fallback to property name when no attributes present
         var descriptionLabel = appElement.FindElement(By.Id("description-label"));
         Browser.Equal("Description", () => descriptionLabel.Text);
+
+        // Check that ResourceType localization works with English resources
+        var localizedLabel = appElement.FindElement(By.Id("localized-label"));
+        Browser.Equal("Product Name", () => localizedLabel.Text);
     }
 
     [Fact]
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor
index f70da687f53d..fda324c7c8a9 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/DisplayNameComponent.razor
@@ -7,6 +7,7 @@
     <p id="price-label"><DisplayName For="@(() => _product.Price)" /></p>
     <p id="stock-label"><DisplayName For="@(() => _product.StockQuantity)" /></p>
     <p id="description-label"><DisplayName For="@(() => _product.Description)" /></p>
+    <p id="localized-label"><DisplayName For="@(() => _product.LocalizedName)" /></p>
 </div>
 
 @code {
@@ -26,5 +27,9 @@
 
         // No attributes - should fall back to property name
         public string Description { get; set; } = "Test";
+
+        // Uses resource file for localization - will show "Product Name" in en-US, "Nom du produit" in fr-FR
+        [Display(Name = nameof(TestResources.ProductName), ResourceType = typeof(TestResources))]
+        public string LocalizedName { get; set; } = "Localized";
     }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/Resources.fr.resx b/src/Components/test/testassets/BasicTestApp/Resources.fr.resx
index 1371dedf99d7..5cffee6d040d 100644
--- a/src/Components/test/testassets/BasicTestApp/Resources.fr.resx
+++ b/src/Components/test/testassets/BasicTestApp/Resources.fr.resx
@@ -120,4 +120,7 @@
   <data name="Message" xml:space="preserve">
     <value> Bonjour!</value>
   </data>
+  <data name="ProductName" xml:space="preserve">
+    <value>Nom du produit</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/Resources.resx b/src/Components/test/testassets/BasicTestApp/Resources.resx
index f160f449685f..4233071d8a4b 100644
--- a/src/Components/test/testassets/BasicTestApp/Resources.resx
+++ b/src/Components/test/testassets/BasicTestApp/Resources.resx
@@ -120,4 +120,7 @@
   <data name="Message" xml:space="preserve">
     <value>Hello!</value>
   </data>
+  <data name="ProductName" xml:space="preserve">
+    <value>Product Name</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/TestResources.cs b/src/Components/test/testassets/BasicTestApp/TestResources.cs
new file mode 100644
index 000000000000..70f1bb537aaf
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/TestResources.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace BasicTestApp;
+
+// Wrap resources to make them available as public properties for [Display]. That attribute does not support
+// internal properties.
+public static class TestResources
+{
+    public static string ProductName => Resources.ProductName;
+}