diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs
index 21a1f33e6a..032c29618f 100644
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -361,11 +361,23 @@ namespace Umbraco.Core
             [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
             public const string UploadField = "5032A6E6-69E3-491D-BB28-CD31CD11086C";
 
+            /// <summary>
+            /// Alias for the User picker datatype.
+            /// </summary>
+            public const string UserPickerAlias = "Umbraco.UserPicker";
+
+            /// <summary>
+            /// Guid for the User picker datatype.
+            /// </summary>
+            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
+            public const string UserPicker = "e66af4a0-e8b4-11de-8a39-0800200c9a66";
+
             /// <summary>
             /// Alias for the Upload field datatype.
             /// </summary>
             public const string UploadFieldAlias = "Umbraco.UploadField";
 
+
             /// <summary>
             /// Guid for the XPath CheckBoxList datatype.
             /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs b/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs
index a886df4874..92be126c86 100644
--- a/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs
@@ -116,6 +116,7 @@ namespace Umbraco.Core.PropertyEditors
             CreateMap(Guid.Parse(Constants.PropertyEditors.TinyMCEv3), Constants.PropertyEditors.TinyMCEv3Alias);
             CreateMap(Guid.Parse(Constants.PropertyEditors.TrueFalse), Constants.PropertyEditors.TrueFalseAlias);
             CreateMap(Guid.Parse(Constants.PropertyEditors.UltimatePicker), Constants.PropertyEditors.UltimatePickerAlias);
+            CreateMap(Guid.Parse(Constants.PropertyEditors.UserPicker), Constants.PropertyEditors.UserPickerAlias);
             CreateMap(Guid.Parse(Constants.PropertyEditors.UltraSimpleEditor), Constants.PropertyEditors.UltraSimpleEditorAlias);
             CreateMap(Guid.Parse(Constants.PropertyEditors.UmbracoUserControlWrapper), Constants.PropertyEditors.UmbracoUserControlWrapperAlias);
             CreateMap(Guid.Parse(Constants.PropertyEditors.UploadField), Constants.PropertyEditors.UploadFieldAlias);
diff --git a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
index a8a3eec6ee..4fb52da9c1 100644
--- a/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    [PropertyEditor("e66af4a0-e8b4-11de-8a39-0800200c9a66", "User picker", "INT", "userpicker")]
+    [PropertyEditor(Constants.PropertyEditors.UserPickerAlias, "User picker", "INT", "userpicker")]
     public class UserPickerPropertyEditor : PropertyEditor
     {