diff --git a/helios/templates/election_keygenerator.html b/helios/templates/election_keygenerator.html
index da5ddbe22db7d94f1a2d191fae97566adcec23aa..946533d523919b422d1091cb44fc57bbbfb5742d 100644
--- a/helios/templates/election_keygenerator.html
+++ b/helios/templates/election_keygenerator.html
@@ -118,7 +118,7 @@ Your key has been generated, but you may choose to<br /><a href="javascript:clea
 </span>
 
 <p>
-    <button style="font-size:16pt;" onclick="download_sk(); $('#pk_link').show();">Download your secret key</button>
+    <button style="font-size:16pt;" onclick="download_sk(); $('#pk_link').show();">Save your secret key</button>
 </p>
 
 <p style="display: none;" id="pk_link">
diff --git a/helios/templates/election_view.html b/helios/templates/election_view.html
index 78beb63402a03d3725a46858636a9b9ee80a8c5a..6580d5027adf25ec222d277c8e12497b19a3f2ba 100644
--- a/helios/templates/election_view.html
+++ b/helios/templates/election_view.html
@@ -243,7 +243,8 @@ You are <em>not eligible</em> to vote in this {{election.election_type}}.
 
 {% if election.openreg %}
 {% if election.eligibility %}
-This election is open to: {{election.pretty_eligibility|safe}}.  <a href="{{settings.SECURE_URL_HOST}}{% url auth.views.index %}?return_url={{CURRENT_URL}}">Log in</a> to check your eligibility.
+This election is open to: {{election.pretty_eligibility|safe}}
+<a href="{{settings.SECURE_URL_HOST}}{% url auth.views.index %}?return_url={{CURRENT_URL}}">Log in</a> to check your eligibility.
 {% else %}
 Anyone can vote in this election.
 {% endif %}
diff --git a/helios/views.py b/helios/views.py
index ef097a591dc29873330dade1c5a2d03197ef6c85..2409e4130e02d6d1d02fcaf7683fb56dcf369f0e 100644
--- a/helios/views.py
+++ b/helios/views.py
@@ -1009,7 +1009,7 @@ def trustee_decrypt_and_prove(request, election, trustee):
 @election_view(frozen=True)
 def trustee_upload_decryption(request, election, trustee_uuid):
   if not _check_election_tally_type(election) or election.encrypted_tally == None:
-    return HttpResponseRedirect(reverse(one_election_view,args=[election.election_id]))
+    return FAILURE
 
   trustee = Trustee.get_by_election_and_uuid(election, trustee_uuid)