Index: user/des/fbce/root/run/edit.tt
===================================================================
--- user/des/fbce/root/run/edit.tt	(revision 235758)
+++ user/des/fbce/root/run/edit.tt	(revision 235759)
@@ -1,28 +1,26 @@
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% PROCESS run/when %]
 
-[% IF nominating == 0 %]
+[% IF !user.active %]
+<p>You are not qualified to run in the election.  If you believe this is incorrect, please contact the election administrator.</p>
+[% ELSIF nominating == 0 %]
 <form method="post" action="">
-  <fieldset>
-    <legend>Slogan</legend>
-    <input name="short" size="80" maxlength="64" value="[% short | html %]"/>
+  <p>Slogan</p>
+  <input name="short" size="80" maxlength="64" value="[% short | html %]"/>
+  <p>Statement (<a href="http://search.cpan.org/~chromatic/Text-WikiFormat-0.79/lib/Text/WikiFormat.pm#Wiki_Format">WikiFormat</a>)</p> 
+  <textarea name="long" cols="80" rows="24">[% long | html %]</textarea>
   </fieldset>
-  <fieldset>
-    <legend>Statement</legend>
-    <textarea name="long" cols="80" rows="24">[% long | html %]</textarea>
-  </fieldset>
   <div>
-    <span class="help"><a href="http://search.cpan.org/~chromatic/Text-WikiFormat-0.79/lib/Text/WikiFormat.pm#Wiki_Format">WikiFormat syntax</a></span>
     <input type="submit" name="submit" value="Update my statement!"/>
     <input type="submit" name="cancel" value="No, I'm fine."/>
     <input type="reset" value="Undo"/>
   </div>
 </form>
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/run/index.tt
===================================================================
--- user/des/fbce/root/run/index.tt	(revision 235758)
+++ user/des/fbce/root/run/index.tt	(revision 235759)
@@ -1,28 +1,27 @@
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% PROCESS run/when %]
 
-[% IF user.statement.defined %]
+[% IF !user.active %]
+<p>You are not qualified to run in the election.  If you believe this is incorrect, please contact the election administrator.</p>
+[% ELSIF user.statement.defined %]
 <p>You have registered as a candidate in the 2010 FreeBSD Core Team election.  You have provided the following statement:</p>
 
 <div class="statement"> 
   <h3 class="statement-title">[% user.statement.short | html %]</h3>
   <div class="statement-body">
     [% user.statement.long_html %]
   </div>
 </div>
-[% END %]
-
-[% IF nominating == 0 %]
-  [% IF user.statement.defined %]
+  [% IF nominating == 0 %]
 <p>You can <a href="[% c.uri_for('/run/edit') | html %]">edit your statement</a> or <a href="[% c.uri_for('/run/withdraw') | html %]">withdraw your candidacy</a>.</p>
-  [% ELSE %]
-<p>You can <a href="[% c.uri_for('/run/register') | html %]">register your candidacy</a> in the 2010 FreeBSD Core Team election.</p>
   [% END %]
+[% ELSIF nominating == 0 %]
+<p>You can <a href="[% c.uri_for('/run/register') | html %]">register your candidacy</a> in the election.</p>
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/run/register.tt
===================================================================
--- user/des/fbce/root/run/register.tt	(revision 235758)
+++ user/des/fbce/root/run/register.tt	(revision 235759)
@@ -1,28 +1,31 @@
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% PROCESS run/when %]
 
-[% IF nominating == 0 %]
+[% IF !user.active %]
+<p>You are not qualified to run in the election.  If you believe this is incorrect, please contact the election administrator.</p>
+[% ELSIF nominating == 0 %]
 <p>To register as a candidate in the election, enter the following information:</p>
 <ul>
   <li>A short slogan which will appear next to your name on the list of candidates and at the top of your candidate page;</li>
   <li>A longer statement about your background, why you are running and what you intend to do if elected.</li>
 </ul>
+<p>If you have a <a href="http://en.gravatar.com/">Gravatar</a>, it will appear next to your statement.</p>
 <form method="post" action="">
   <p>Slogan</p>
   <input name="short" size="80" maxlength="64" value="[% short | html %]"/>
   <p>Statement (<a href="http://search.cpan.org/~chromatic/Text-WikiFormat-0.79/lib/Text/WikiFormat.pm#Wiki_Format">WikiFormat</a>)</p>
   <textarea name="long" cols="80" rows="24">[% long | html %]</textarea>
   <div>
     <input type="submit" name="submit" value="I choose to run!"/>
     <input type="submit" name="cancel" value="Ah, screw this."/>
     <input type="reset" value="Undo"/>
   </div>
 </form>
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/run/withdraw.tt
===================================================================
--- user/des/fbce/root/run/withdraw.tt	(revision 235758)
+++ user/des/fbce/root/run/withdraw.tt	(revision 235759)
@@ -1,14 +1,20 @@
 [% PROCESS lib/html_top %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
+[% IF !user.active %]
+<p>You are not qualified to run in the election.  If you believe this is incorrect, please contact the election administrator.</p>
+[% ELSIF !user.statement.defined %]
+<p>You have not registered as a candidate.</p>
+[% ELSE %]
 <p>Are you sure you want to withdraw your candidacy?  Note that your statement will be permanently deleted from the database; if you change your mind, you will have to start over.</p>
 
 <form method="post" action="">
   <input type="submit" name="submit" value="I'm outta here!"/>
   <input type="submit" name="cancel" value="No, I'll stay."/>
 </form>
+[% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]
Index: user/des/fbce/root/vote/index.tt
===================================================================
--- user/des/fbce/root/vote/index.tt	(revision 235758)
+++ user/des/fbce/root/vote/index.tt	(revision 235759)
@@ -1,81 +1,84 @@
 [% WRAPPER lib/html_top %]
 <script type="text/javascript">
   function setTotal(n) {
     var total = document.getElementById("total");
     total.innerHTML = new Number(n).toString();
     if (n > [% max_votes ? max_votes : 0 %])
       total.style.color = "red";
     else
       total.style.color = total.parentNode.style.color;
   }
 
   function updateTotal() {
     var inputs = document.getElementsByTagName("input");
     var total = 0;
     for (var i = 0; i < inputs.length; i++) {
 	  if (inputs[i].checked == true)
 	    total++;
 	}
 	setTotal(total);
   }
 
   function initTotal() {
     setTotal([% voted_for.keys.size %]);
     document.getElementById("totalrow").style.visibility = "visible";
   }
 </script>
 [% END %]
 [% PROCESS lib/header %]
 [% WRAPPER lib/main %]
 
 [% PROCESS vote/when %]
-[% IF voting == 0 %]
+
+[% IF !user.active %]
+<p>You are not qualified to vote in the election.  If you believe this is incorrect, please contact the election administrator.</p>
+[% ELSIF voting == 0 %]
   [% IF candidates.count == 0 %]
   <p>There are no candidates to vote for.</p>
   [% ELSE %]
   <p>You may vote for up to [% max_votes %] candidates from the list below.  You can modify your vote at any time until voting closes (see the <a href="[% c.uri_for('/') | html %]#schedule">schedule</a> on the front page).</p>
   <form method="POST" action="" onreset="setTotal([% voted_for.keys.size %])">
     <table class="vote">
       [% IF vote_ok.defined %]
       <tr>
 	<td colspan="3">
 	  <p class="message">Your vote was registered.  You may change it at any time until voting closes.</p>
 	</td>
       </tr>
       [% END %]
       [% IF error.defined %]
       <tr>
 	<td colspan="3">
 	  <p class="error">[% error | html %]</p>
 	</td>
       </tr>
       [% END %]
       [% WHILE (candidate = candidates.next) %]
       [% login = candidate.login %]
       <tr>
 	<td><input type="checkbox" name="vote_for_[% login %]" id="vote_for_[% login %]"[% IF voted_for.$login %] checked="checked"[% END %] onclick="updateTotal()"/></td>
-	<td><label for="vote_for_[% login %]">[% candidate.name | html %]</label></td>
+	<td><label for="vote_for_[% login %]">[% candidate.name | html %]:</label></td>
 	<td><a href="[% c.uri_for('/see/candidate', login) | html %]">[% candidate.statement.short | html %]</a></td>
       </tr>
       [% END %]
       <tr id="totalrow" style="visibility: collapse">
 	<td style="text-align: center;" id="total">X</td>
 	<td colspan="2">votes cast</td>
       </tr>
       <tr>
 	<td colspan="3">
 	  <p>
 	    <input type="reset" name="reset" value="Reset"/>
 	    <input type="submit" name="vote" value="Vote!"/>
 	    <input type="submit" name="cancel" value="[% IF voted_for.size == 0 %]Not yet.[% ELSE %]Don't change.[% END %]"/>
 	  </p>
 	</td>
       </tr>
     </table>
   </form>
   [% END %]
 [% END %]
 
 [% END %]
 [% PROCESS lib/footer %]
 [% PROCESS lib/html_bottom %]