diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs
index 0c6bb0e532..b30a664991 100644
--- a/src/umbraco.cms/businesslogic/member/Member.cs
+++ b/src/umbraco.cms/businesslogic/member/Member.cs
@@ -588,7 +588,7 @@ namespace umbraco.cms.businesslogic.member
                         if (property.Value != null)
                         {
                             string dbType = property.PropertyType.DataTypeDefinition.DbType;
-                            if (dbType.Equals("dataInt"))
+                            if (dbType.Equals("Int"))
                             {
                                 int value = 0;
                                 if (int.TryParse(property.Value.ToString(), out value))
@@ -596,11 +596,11 @@ namespace umbraco.cms.businesslogic.member
                                     poco.Integer = value;
                                 }
                             }
-                            else if (dbType.Equals("dataDate"))
+                            else if (dbType.Equals("Date"))
                             {
                                 poco.Date = DateTime.Parse(property.Value.ToString());
                             }
-                            else if (dbType.Equals("dataNvarchar"))
+                            else if (dbType.Equals("Nvarchar"))
                             {
                                 poco.VarChar = property.Value.ToString();
                             }
diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
index 3b2ce64443..34b4c1b568 100644
--- a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
+++ b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
@@ -165,6 +165,10 @@ namespace umbraco.editorControls.userControlGrapper
 
 		private void LoadSetttings(string fileName)
 		{
+            // due to legacy, some user controls may not have the tilde start
+            if (fileName.StartsWith("~/"))
+                fileName = fileName.Substring(2);
+
 			if (System.IO.File.Exists(IOHelper.MapPath("~/" + fileName)))
 			{