diff --git a/Samples/WpfExample/BusinessLibrary/PersonEdit.cs b/Samples/WpfExample/BusinessLibrary/PersonEdit.cs
index bb6397de47..2065f2a4dc 100644
--- a/Samples/WpfExample/BusinessLibrary/PersonEdit.cs
+++ b/Samples/WpfExample/BusinessLibrary/PersonEdit.cs
@@ -17,7 +17,7 @@ public int Id
       set { SetProperty(IdProperty, value); }
     }
 
-    public static readonly PropertyInfo<string> NameProperty = RegisterProperty<string>(nameof(Name));
+    public static readonly PropertyInfo<string> NameProperty = RegisterProperty<string>(nameof(Name), "Person Name");
     [Required]
     public string Name
     {
diff --git a/Samples/WpfExample/WpfExample/Pages/PersonEditPage.xaml b/Samples/WpfExample/WpfExample/Pages/PersonEditPage.xaml
index 5d4d40c596..2775da47ae 100644
--- a/Samples/WpfExample/WpfExample/Pages/PersonEditPage.xaml
+++ b/Samples/WpfExample/WpfExample/Pages/PersonEditPage.xaml
@@ -3,6 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:csla="clr-namespace:Csla.Xaml;assembly=Csla.Xaml"
       xmlns:businesslibrary="clr-namespace:BusinessLibrary;assembly=BusinessLibrary" d:DataContext="{d:DesignInstance Type=businesslibrary:PersonEdit}"
       mc:Ignorable="d" Loaded="UserControl_Loaded"
       d:DesignHeight="450" d:DesignWidth="800">
@@ -16,7 +17,8 @@
       <ColumnDefinition Width="Auto" />
       <ColumnDefinition Width="Auto" />
     </Grid.ColumnDefinitions>
-    <TextBlock Text="Name" Grid.Row="0" Grid.Column="0" />
+    <csla:PropertyInfo Property="{Binding Name}" x:Name="NameInfo" />
+    <Label Content="{Binding ElementName=NameInfo, Path=FriendlyName}" Grid.Row="0" Grid.Column="0" />
     <TextBox Text="{Binding Name}" Grid.Row="0" Grid.Column="1" Width="200" />
     <Button Content="Save" Grid.Row="1" Grid.Column="1" IsEnabled="{Binding IsSavable}" Click="SavePerson" />
   </Grid>
diff --git a/Source/Csla.Xaml.Shared/PropertyInfo.cs b/Source/Csla.Xaml.Shared/PropertyInfo.cs
index 2104a1b57e..dda6a6603e 100644
--- a/Source/Csla.Xaml.Shared/PropertyInfo.cs
+++ b/Source/Csla.Xaml.Shared/PropertyInfo.cs
@@ -564,6 +564,28 @@ void source_BusyChanged(object? sender, BusyChangedEventArgs e)
 
     #endregion
 
+    #region FriendlyName
+
+    /// <summary>
+    /// Gets the friendly name for the property.
+    /// </summary>
+    [Category("Property Status")]
+    public string FriendlyName
+    {
+      get
+      {
+        if (Source != null && !string.IsNullOrWhiteSpace(BindingPath))
+        {
+          var pi = Core.FieldManager.PropertyInfoManager.GetRegisteredProperty(Source.GetType(), BindingPath);
+          if (pi != null)
+            return pi.FriendlyName;
+        }
+        return string.Empty;
+      }
+    }
+
+    #endregion
+
     #region Error/Warn/Info Text
 
     /// <summary>
@@ -854,6 +876,7 @@ orderby r.Severity
       OnPropertyChanged(nameof(ErrorText));
       OnPropertyChanged(nameof(WarningText));
       OnPropertyChanged(nameof(InformationText));
+      OnPropertyChanged(nameof(FriendlyName));
     }
 
     #endregion