diff --git a/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs
index 9c1f72e473..5d437f5d91 100644
--- a/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs
@@ -21,16 +21,7 @@ namespace Umbraco.Core.PropertyEditors
 		/// <returns></returns>
 		public Attempt<object> ConvertPropertyValue(object value)
 		{
-			if (value == null) return new Attempt<object>(false, null);
-			//if its already a DateTime
-			if (TypeHelper.IsTypeAssignableFrom<DateTime>(value))
-				return new Attempt<object>(true, value);
-			//convert to string
-			var asString = Convert.ToString(value);
-			DateTime dt;
-			return DateTime.TryParse(asString, out dt) 
-			       	? new Attempt<object>(true, dt) 
-			       	: new Attempt<object>(false, null);
+			return value.TryConvertTo(typeof(DateTime));
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs
index b44b00c882..3cac051c94 100644
--- a/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs
@@ -16,18 +16,7 @@ namespace Umbraco.Core.PropertyEditors
 		/// <returns></returns>
 		public Attempt<object> ConvertPropertyValue(object value)
 		{
-			if (value == null) return new Attempt<object>(false, null);
-			//if its already a bool
-			if (TypeHelper.IsTypeAssignableFrom<bool>(value))
-				return new Attempt<object>(true, value);
-			//convert to string
-			var asString = Convert.ToString(value);
-			bool asBool;
-			return bool.TryParse(asString, out asBool)
-			       	? new Attempt<object>(true, asBool)
-			       	: bool.TryParse(asString.Replace("1", "true").Replace("0", "false"), out asBool) //convert 0 or 1 to true or false
-			       	  	? new Attempt<object>(true, asBool)
-			       	  	: new Attempt<object>(false, null);
+			return value.TryConvertTo(typeof(bool));
 		}
 	}
 }
\ No newline at end of file