diff --git a/erpnext/patches/4_0/customer_discount_to_pricing_rule.py b/erpnext/patches/4_0/customer_discount_to_pricing_rule.py
index a92568e8d4f..87aa79248e3 100644
--- a/erpnext/patches/4_0/customer_discount_to_pricing_rule.py
+++ b/erpnext/patches/4_0/customer_discount_to_pricing_rule.py
@@ -23,10 +23,10 @@ def execute():
 				"item_group": item_group,
 				"applicable_for": "Customer",
 				"customer": d.parent,
-				"price_or_discount": "Discount",
+				"price_or_discount": "Discount Percentage",
 				"discount_percentage": d.discount
 			}).insert()
 	
 	frappe.db.auto_commit_on_many_writes = False		
 	
-	frappe.delete_doc("DocType", "Customer Discount")
\ No newline at end of file
+	frappe.delete_doc("DocType", "Customer Discount")
diff --git a/erpnext/support/doctype/support_email_settings/support_email_settings.py b/erpnext/support/doctype/support_email_settings/support_email_settings.py
index 592c1a90a8c..8763c6d2693 100644
--- a/erpnext/support/doctype/support_email_settings/support_email_settings.py
+++ b/erpnext/support/doctype/support_email_settings/support_email_settings.py
@@ -17,7 +17,7 @@ class SupportEmailSettings(Document):
 			Checks support ticket email settings
 		"""
 		if self.sync_support_mails and self.mail_server:
-			inc_email = frappe.get_doc('Incoming Email Settings')
+			inc_email = frappe._dict(self.as_dict())
 			# inc_email.encode()
 			inc_email.host = self.mail_server
 			inc_email.use_ssl = self.use_ssl