diff --git a/helios/views.py b/helios/views.py
index f15f1c801d849ae1bf99de5970a98f6d0f80fdf9..308ebd8dd3ae4d20be69c36b3cbd3232ef081008 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -1251,6 +1251,8 @@ def voters_email(request, election):
       'custom_message': '<YOUR MESSAGE HERE>',
       'voter': {'vote_hash' : '<SMART_TRACKER>',
                 'name': '<VOTER_NAME>',
+                'voter_login_id': '<VOTER_LOGIN_ID>',
+                'voter_password': '<VOTER_PASSWORD>',
                 'voter_type' : election.voter_set.all()[0].voter_type,
                 'election' : election}
       })
@@ -1269,7 +1271,7 @@ def voters_email(request, election):
       extra_vars = {
         'custom_subject' : email_form.cleaned_data['subject'],
         'custom_message' : email_form.cleaned_data['body'],
-        'election_url' : election_url,
+        'election_vote_url' : election_vote_url,
         'election' : election
         }