diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 3337b1f1b66..9971baaaa1a 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -26,7 +26,8 @@ def check_setup_wizard_not_completed():
 		return False
 
 def set_single_defaults():
-	for dt in frappe.db.sql_list("""select name from `tabDocType` where issingle=1"""):
+	for dt in ('Accounts Settings', 'Print Settings', 'HR Settings', 'Buying Settings',
+		'Selling Settings', 'Stock Settings'):
 		default_values = frappe.db.sql("""select fieldname, `default` from `tabDocField`
 			where parent=%s""", dt)
 		if default_values:
@@ -37,6 +38,8 @@ def set_single_defaults():
 				b.save()
 			except frappe.MandatoryError:
 				pass
+			except frappe.ValidationError:
+				pass
 
 	frappe.db.set_default("date_format", "dd-mm-yyyy")