fixed language to have emails and login screen match

helios/forms.py

@@ -37,6 +37,6 @@ class TallyNotificationEmailForm(forms.Form):
   send_to = forms.ChoiceField(label="Send To", choices= [('all', 'all voters'), ('voted', 'only voters who cast a ballot'), ('none', 'no one -- are you sure about this?')])
 
 class VoterPasswordForm(forms.Form):
-  voter_id = forms.CharField(max_length=50)
+  voter_id = forms.CharField(max_length=50, label="Voter ID")
   password = forms.CharField(widget=forms.PasswordInput(), max_length=100)
 

helios/templates/email/vote_body.txt

@@ -5,7 +5,7 @@ Dear {{voter.name}},
 Election URL:  {{election_url}}
 Election Fingerprint:  {{voter.election.hash}}
 {% ifequal voter.voter_type "password" %}
-Your username: {{voter.voter_login_id}}
+Your voter ID: {{voter.voter_login_id}}
 Your password: {{voter.voter_password}}
 {% else %}
 Log in with your {{voter.voter_type}} account.