diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index cb9dd0c4..2b5d01ee 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -124,7 +124,6 @@
                                         @if (!string.IsNullOrEmpty(p.Autocomplete))
                                         {
                                             <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))" autocomplete="@p.Autocomplete">
-                                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                                 @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                                 {
                                                     var values = option.Split(':');
@@ -144,7 +143,6 @@
                                         else
                                         {
                                             <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                                <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                                 @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                                 {
                                                     var values = option.Split(':');
@@ -417,7 +415,8 @@
                 if (profile.Options.ToLower().StartsWith("entityname:"))
                 {
                     var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
-                    profile.Options = string.Join(",", options.Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
                 }
             }
             _timezones = TimeZoneService.GetTimeZones();
diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor
index 99f5694c..6e19d832 100644
--- a/Oqtane.Client/Modules/Admin/Users/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Add.razor
@@ -86,7 +86,6 @@
                                 @if (!string.IsNullOrEmpty(p.Options))
                                 {
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                        <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
                                             var values = option.Split(':');
@@ -154,7 +153,8 @@
                 if (profile.Options.ToLower().StartsWith("entityname:"))
                 {
                     var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
-                    profile.Options = string.Join(",", options.Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
                 }
             }
             _settings = new Dictionary<string, string>();
diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor
index 9bf7ea28..b631e59d 100644
--- a/Oqtane.Client/Modules/Admin/Users/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor
@@ -119,7 +119,6 @@
                                 @if (!string.IsNullOrEmpty(p.Options))
                                 {
                                     <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
-                                        <option value="">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                                         @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                         {
                                             var values = option.Split(':');
@@ -213,7 +212,8 @@
                 if (profile.Options.ToLower().StartsWith("entityname:"))
                 {
                     var options = await SettingService.GetSettingsAsync(profile.Options.Substring(11), -1);
-                    profile.Options = string.Join(",", options.Select(kvp => $"{kvp.Key}:{kvp.Value}"));
+                    options.Add("", $"<{SharedLocalizer["Not Specified"]}>");
+                    profile.Options = string.Join(",", options.OrderBy(item => item.Value).Select(kvp => $"{kvp.Key}:{kvp.Value}"));
                 }
             }
             _timezones = TimeZoneService.GetTimeZones();