diff --git a/frappe/auth.py b/frappe/auth.py
index 70bcdac6b7..e48d21fc15 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -64,7 +64,9 @@ class HTTPRequest:
 
 	def validate_csrf_token(self):
 		if frappe.local.request and frappe.local.request.method=="POST":
-			if not frappe.local.session.data.csrf_token or frappe.local.session.data.device=="mobile":
+			if not frappe.local.session.data.csrf_token \
+				or frappe.local.session.data.device=="mobile" \
+				or frappe.conf.get('ignore_csrf', None):
 				# not via boot
 				return
 
diff --git a/frappe/model/naming.py b/frappe/model/naming.py
index d78effc8bf..680823325e 100644
--- a/frappe/model/naming.py
+++ b/frappe/model/naming.py
@@ -30,10 +30,10 @@ def set_new_name(doc):
 	elif getattr(doc.meta, "issingle", False):
 		doc.name = doc.doctype
 
-	elif hasattr(doc, "autoname"):
+	else:
 		doc.run_method("autoname")
 
-	elif autoname:
+	if not doc.name and autoname:
 		if autoname.startswith('field:'):
 			fieldname = autoname[6:]
 			doc.name = (doc.get(fieldname) or "").strip()
@@ -195,7 +195,7 @@ def append_number_if_name_exists(doc):
 			count = "1"
 
 		doc.name = "{0}-{1}".format(doc.name, count)
-		
+
 	return doc
 
 def de_duplicate(doctype, name):