diff --git a/helios/templates/_castconfirm_docast.html b/helios/templates/_castconfirm_docast.html
index 85896da3c903a420adedc94590c773bcd9f99693..0ed93ebf86e151dada816c608cb453f62dd27c4a 100644
--- a/helios/templates/_castconfirm_docast.html
+++ b/helios/templates/_castconfirm_docast.html
@@ -16,7 +16,9 @@
 <br />
 {% endif %}
 
-    <button type="submit" class="medium">I am <u>{{voter.display_html_big|safe}}</u>, cast this ballot</button>
+You are logged in as <u>{{voter.display_html_big|safe}}</u><br /><br />
+
+    <button type="submit" class="large">CAST this ballot</button>
     <span style="font-size:0.8em;"><br />You can cast as many ballots as you want.<br />Only the last one counts.</span>
 </form>
 
diff --git a/helios/templates/_castconfirm_password.html b/helios/templates/_castconfirm_password.html
index 520c1bc96b065c03564180d97e01c6a77ed901ea..fe499b9343a559687ccec196f612a804c98cc3f6 100644
--- a/helios/templates/_castconfirm_password.html
+++ b/helios/templates/_castconfirm_password.html
@@ -11,6 +11,10 @@ Please provide the voter ID and password you received by email.<br /><br />
 bad voter ID or password, please try again.
 </p>
 {% endif %}
+{% if cast_ballot == "1" %}
 <input type="submit" class="button" value="cast ballot" />
+{% else %}
+<input type="submit" class="button" value="log in" />
+{% endif %}
 </form>