From 41915080b2745207cdf596921d955831394d2f2e Mon Sep 17 00:00:00 2001
From: andyneil <beanbop@gmail.com>
Date: Thu, 7 Nov 2019 15:01:22 +0000
Subject: [PATCH] Fix incorrect data types for default member properties.
 (#7086)

Issue https://github.com/umbraco/Umbraco-CMS/issues/7051
---
 src/Umbraco.Core/Constants-Conventions.cs      | 18 ++++++++++++------
 .../Implement/MemberTypeRepository.cs          | 13 +++++++++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index 6c9407667a..e78c498e66 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -221,7 +221,8 @@ namespace Umbraco.Core
                             FailedPasswordAttempts,
                             new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Integer, true, FailedPasswordAttempts)
                             {
-                                Name = FailedPasswordAttemptsLabel
+                                Name = FailedPasswordAttemptsLabel,
+                                DataTypeId = Constants.DataTypes.LabelInt
                             }
                         },
                         {
@@ -242,35 +243,40 @@ namespace Umbraco.Core
                             LastLockoutDate,
                             new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLockoutDate)
                             {
-                                Name = LastLockoutDateLabel
+                                Name = LastLockoutDateLabel,
+                                DataTypeId = Constants.DataTypes.LabelDateTime
                             }
                         },
                         {
                             LastLoginDate,
                             new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLoginDate)
                             {
-                                Name = LastLoginDateLabel
+                                Name = LastLoginDateLabel,
+                                DataTypeId = Constants.DataTypes.LabelDateTime
                             }
                         },
                         {
                             LastPasswordChangeDate,
                             new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastPasswordChangeDate)
                             {
-                                Name = LastPasswordChangeDateLabel
+                                Name = LastPasswordChangeDateLabel,
+                                DataTypeId = Constants.DataTypes.LabelDateTime
                             }
                         },
                         {
                             PasswordAnswer,
                             new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordAnswer)
                             {
-                                Name = PasswordAnswerLabel
+                                Name = PasswordAnswerLabel,
+                                DataTypeId = Constants.DataTypes.LabelString
                             }
                         },
                         {
                             PasswordQuestion,
                             new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordQuestion)
                             {
-                                Name = PasswordQuestionLabel
+                                Name = PasswordQuestionLabel,
+                                DataTypeId = Constants.DataTypes.LabelString
                             }
                         }
                     };
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index ee651819bf..c3b95dbd8f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -225,8 +225,17 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 if (builtinProperties.ContainsKey(propertyType.Alias))
                 {
                     //this reset's its current data type reference which will be re-assigned based on the property editor assigned on the next line
-                    propertyType.DataTypeId = 0;
-                    propertyType.DataTypeKey = default;
+                    var propDefinition = builtinProperties[propertyType.Alias];
+                    if (propDefinition != null)
+                    {
+                        propertyType.DataTypeId = propDefinition.DataTypeId;
+                        propertyType.DataTypeKey = propDefinition.DataTypeKey;
+                    }
+                    else
+                    {
+                        propertyType.DataTypeId = 0;
+                        propertyType.DataTypeKey = default;
+                    }
                 }
             }
         }