diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py
index 62d0dce95b..1f9b6fae0a 100644
--- a/frappe/email/smtp.py
+++ b/frappe/email/smtp.py
@@ -191,8 +191,7 @@ class SMTPServer:
 				self._sess.ehlo()
 
 			if self.login and self.password:
-				ret = self._sess.login((self.login or "").encode('utf-8'),
-					(self.password or "").encode('utf-8'))
+				ret = self._sess.login((self.login or ""), (self.password or ""))
 
 				# check if logged correctly
 				if ret[0]!=235:
diff --git a/frappe/website/render.py b/frappe/website/render.py
index 33163e6aa9..490fadd5c9 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -98,7 +98,7 @@ def get_static_file_response():
 		raise NotFound
 
 	response = Response(wrap_file(frappe.local.request.environ, f), direct_passthrough=True)
-	response.mimetype = mimetypes.guess_type(frappe.flags.file_path)[0] or b'application/octet-stream'
+	response.mimetype = mimetypes.guess_type(frappe.flags.file_path)[0] or 'application/octet-stream'
 	return response
 
 def build_response(path, data, http_status_code, headers=None):