diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 166f61de8d..69d3b67220 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -366,7 +366,7 @@ class User(Document):
 		if getattr(frappe.local, "login_manager", None):
 			frappe.local.login_manager.logout(user=self.name)
 
-		frappe.db.delete("Todo", {"owner": self.name})
+		frappe.db.delete("ToDo", {"owner": self.name})
 		# frappe.db.sql("""DELETE FROM `tabToDo` WHERE `owner`=%s""", (self.name,))
 		frappe.db.sql("""UPDATE `tabToDo` SET `assigned_by`=NULL WHERE `assigned_by`=%s""",
 			(self.name,))
diff --git a/frappe/database/database.py b/frappe/database/database.py
index 5b4d813011..60185106e1 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -966,9 +966,15 @@ class Database(object):
 				), values, debug=debug)
 
 		else:
-			return self.sql("DELETE FROM `tab{doctype}`".format(
-				doctype=doctype
-			), debug=debug)
+			if doctype.startwith("__"):
+				return self.sql("DELETE FROM `{doctype}`".format(
+					doctype=doctype
+				), debug=debug)
+
+			else:
+				return self.sql("DELETE FROM `tab{doctype}`".format(
+					doctype=doctype
+				), debug=debug)
 
 
 	def get_last_created(self, doctype):