diff --git a/frappe/__init__.py b/frappe/__init__.py
index 7ead092a62..9d3e52800e 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -530,7 +530,7 @@ def call(fn, *args, **kwargs):
 			newargs[a] = kwargs.get(a)
 	return fn(*args, **newargs)
 
-def make_property_setter(args, ignore_validate=False):
+def make_property_setter(args, ignore_validate=False, validate_fields_for_doctype=True):
 	args = _dict(args)
 	ps = get_doc({
 		'doctype': "Property Setter",
@@ -543,6 +543,7 @@ def make_property_setter(args, ignore_validate=False):
 		'__islocal': 1
 	})
 	ps.ignore_validate = ignore_validate
+	ps.validate_fields_for_doctype = validate_fields_for_doctype
 	ps.insert()
 
 def import_doc(path, ignore_links=False, ignore_insert=False, insert=False):
diff --git a/frappe/core/doctype/custom_field/custom_field.py b/frappe/core/doctype/custom_field/custom_field.py
index 4f164f83ae..2c2adb92bf 100644
--- a/frappe/core/doctype/custom_field/custom_field.py
+++ b/frappe/core/doctype/custom_field/custom_field.py
@@ -31,8 +31,7 @@ class CustomField(Document):
 
 	def on_update(self):
 		frappe.clear_cache(doctype=self.dt)
-
-		if not getattr(self, "ignore_validate", None):
+		if not getattr(self, "ignore_validate", False):
 			# validate field
 			from frappe.core.doctype.doctype.doctype import validate_fields_for_doctype
 			validate_fields_for_doctype(self.dt)
@@ -74,7 +73,7 @@ class CustomField(Document):
 			"fieldname": self.fieldname,
 			"property": "previous_field",
 			"value": self.insert_after
-		})
+		}, validate_fields_for_doctype=False)
 
 @frappe.whitelist()
 def get_fields_label(doctype=None):