diff --git a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
index 9034fbe70d..e37bbe22a5 100644
--- a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
+++ b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
@@ -12,12 +12,12 @@ class DocType:
 		
 	def validate(self):
 		self.doc.encode()
-		if self.doc.server:
+		if self.doc.mail_server:
 			from frappe.utils import cint
 			from frappe.utils.email_lib.smtp import SMTPServer
 			smtpserver = SMTPServer(login = self.doc.mail_login,
 				password = self.doc.mail_password,
-				server = self.doc.server,
+				server = self.doc.mail_server,
 				port = cint(self.doc.mail_port),
 				use_ssl = self.doc.use_ssl
 			)
diff --git a/frappe/utils/email_lib/smtp.py b/frappe/utils/email_lib/smtp.py
index 5312b8d79c..576a30eab2 100644
--- a/frappe/utils/email_lib/smtp.py
+++ b/frappe/utils/email_lib/smtp.py
@@ -49,7 +49,7 @@ class SMTPServer:
 			self.use_ssl = cint(use_ssl)
 			self.login = login
 			self.password = password
-		elif es and es.outgoing_mail_server:
+		elif es and es.mail_server:
 			self.server = es.mail_server
 			self.port = es.mail_port
 			self.use_ssl = cint(es.use_ssl)