diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index df320dcda1b..33f03b6ce4a 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -19,7 +19,7 @@ class SellingController(StockController):
 		if frappe.db.get_value('Sales Email Settings', None, 'extract_emails'):
 			return frappe.db.get_value('Sales Email Settings', None, 'email_id')
 		else:
-			return frappe.session.user
+			return comm.sender or frappe.session.user
 
 	def set_missing_values(self, for_validate=False):
 		super(SellingController, self).set_missing_values(for_validate)