diff --git a/mfa/Common.py b/mfa/Common.py
index c2f36f7..340c82b 100644
--- a/mfa/Common.py
+++ b/mfa/Common.py
@@ -2,7 +2,10 @@ from django.conf import settings
 from django.core.mail import EmailMessage
 
 def send(to,subject,body):
-    From = "%s <%s>" % (settings.EMAIL_FROM, settings.EMAIL_HOST_USER)
+    from_email_address = settings.EMAIL_HOST_USER
+    if '@' not in from_email_address:
+        from_email_address = settings.DEFAULT_FROM_EMAIL
+    From = "%s <%s>" % (settings.EMAIL_FROM, from_email_address)
     email = EmailMessage(subject,body,From,to)
     email.content_subtype = "html"
     return email.send(False)
\ No newline at end of file
diff --git a/mfa/Email.py b/mfa/Email.py
index f873e18..a2c3119 100644
--- a/mfa/Email.py
+++ b/mfa/Email.py
@@ -14,7 +14,7 @@ def sendEmail(request,username,secret):
     kwargs = {key: username}
     user = User.objects.get(**kwargs)
     res=render(request,"mfa_email_token_template.html",{"request":request,"user":user,'otp':secret})
-    return  send([user.email],"OTP", str(res.content))
+    return send([user.email],"OTP", res.content.decode())
 
 @never_cache
 def start(request):