diff --git a/join/views.py b/join/views.py
index 2dec0f8..2ff5403 100644
--- a/join/views.py
+++ b/join/views.py
@@ -19,7 +19,7 @@
 def index(request):
     
     if 'join_status' in request.session and request.session['join_status'] == 'joined':
-        render(request, 'join/send_verification.html')
+        return render(request, 'join/send_verification.html')
 
     elif request.method == "POST":
         form = JoinForm(request.POST)
@@ -53,7 +53,7 @@ def index(request):
             send_mail(
                 subject='Verify your identity: Thank you for joining MakeOpenSource!',
                 html_message = html_content,
-                plain_message = strip_tags(html_content),
+                message = strip_tags(html_content),
                 from_email='no-reply@makeopensource.org',
                 recipient_list=[email],
                 fail_silently=False,