diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py
index 217c40d37a..31b0acc856 100644
--- a/frappe/email/smtp.py
+++ b/frappe/email/smtp.py
@@ -66,7 +66,7 @@ def get_outgoing_email_account(raise_exception_not_set=True, append_to=None):
 				frappe.OutgoingEmailError)
 
 		if email_account:
-			if email_account.enable_outgoing:
+			if email_account.enable_outgoing and not getattr(email_account, 'from_site_config', False):
 				email_account.password = email_account.get_password()
 			email_account.default_sender = email.utils.formataddr((email_account.name, email_account.get("email_id")))
 
diff --git a/frappe/translate.py b/frappe/translate.py
index 761db47dc2..19a253f169 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -28,6 +28,8 @@ def guess_language(lang_list=None):
 
 	for l in lang_codes:
 		code = l.strip()
+		if not isinstance(code, unicode):
+			code = unicode(code, 'utf-8')
 		if code in lang_list or code == "en":
 			guess = code
 			break