diff --git a/frappe/defaults.py b/frappe/defaults.py
index fdc5fb6710..8ea477091a 100644
--- a/frappe/defaults.py
+++ b/frappe/defaults.py
@@ -108,7 +108,8 @@ def set_default(key, value, parent, parenttype="__default"):
 	:param parent: Usually, **User** to whom the default belongs.
 	:param parenttype: [optional] default is `__default`."""
 	frappe.db.sql("""delete from `tabDefaultValue` where defkey=%s and parent=%s""", (key, parent))
-	add_default(key, value, parent)
+	if value:
+		add_default(key, value, parent)
 
 def add_default(key, value, parent, parenttype=None):
 	d = frappe.get_doc({
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 5a0a978362..3cd8484c62 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -139,4 +139,5 @@ frappe.patches.v7_1.setup_integration_services #2016-09-16
 frappe.patches.v7_1.rename_chinese_language_codes
 execute:frappe.core.doctype.language.language.update_language_names()
 execute:frappe.db.set_value("Print Settings", "Print Settings", "add_draft_heading", 1)
-frappe.patches.v7_0.cleanup_list_settings
\ No newline at end of file
+frappe.patches.v7_0.cleanup_list_settings
+execute:frappe.db.set_default('language', '')
\ No newline at end of file