diff --git a/www/conservancy/static/supporter-page.js b/www/conservancy/static/supporter-page.js
index d4072562..fa816290 100644
--- a/www/conservancy/static/supporter-page.js
+++ b/www/conservancy/static/supporter-page.js
@@ -40,12 +40,12 @@ $(document).ready(function() {
         $control.find('.toggle-content').slideDown("slow");
     });
     $(".t-shirt-size-selector").hide();
-    $('input[name=os1]:radio').change(function() {
+    $('input[name=on0]:radio').change(function() {
         var input=$(this);
         var tShirtSelector = input.parent().children('.t-shirt-size-selector')
         var noShippingSelector = input.parent().children('input#no_shipping');
         var value = input.val();
-        if (value == "Yes") {
+        if (value == "wantGiftYes") {
             tShirtSelector.show();
             noShippingSelector.val("2");
         } else {
diff --git a/www/conservancy/static/supporter/index.html b/www/conservancy/static/supporter/index.html
index 60608ff4..0a49591c 100644
--- a/www/conservancy/static/supporter/index.html
+++ b/www/conservancy/static/supporter/index.html
@@ -155,35 +155,31 @@ internal policies</a> are published and available for scrutiny.</p>
   Supporters.  <a href="/donate">Donate smaller amounts here</a>.</span><br/>
 
                       <label for="wantGift"><strong>Do you want to receive a t-shirt? </strong></label>
-                      <input type="hidden" name="on1" value="wantGift" />
-                      <input type="radio" name="os1" value="Yes" />Yes
-                      <input type="radio" checked="checked" name="os1" value="No" />No
+                      <input type="radio" name="on0" value="wantGiftYes" />Yes
+                      <input type="radio" checked="checked" name="on0" value="wantGiftNo" />No
                       <br />
                       <span class="t-shirt-size-selector">
-                      <label for="wantGift"><strong>T-shirt size: </strong></label>
-                      <input type="hidden" name="on3" value="size"/>
-                      <select name="os3" id="os3">
-                        <option name="os3" id="os3" value="MenS">Men's S</option>
-                        <option name="os3" id="os3" value="MenM">Men's M</option>
-                        <option name="os3" id="os3" value="MenL">Men's L</option>
-                        <option name="os3" id="os3" value="MenXL">Men's XL</option>
-                        <option name="os3" id="os3" value="Men2XL">Men's 2XL</option>
-                        <option name="os3" id="os3" value="LadiesS">Ladies' S</option>
-                        <option name="os3" id="os3" value="LadiesM">Ladies' M</option>
-                        <option name="os3" id="os3" value="LadiesL">Ladies' L</option>
-                         <option name="os3" id="os3" value="LadiesXL">Ladies' XL</option>
+                      <label for="tShirtSize"><strong>T-shirt size: </strong></label>
+                      <select name="os0" id="os0">
+                        <option name="os0" id="os0" value="MenS">Men's S</option>
+                        <option name="os0" id="os0" value="MenM">Men's M</option>
+                        <option name="os0" id="os0" value="MenL">Men's L</option>
+                        <option name="os0" id="os0" value="MenXL">Men's XL</option>
+                        <option name="os0" id="os0" value="Men2XL">Men's 2XL</option>
+                        <option name="os0" id="os0" value="LadiesS">Ladies' S</option>
+                        <option name="os0" id="os0" value="LadiesM">Ladies' M</option>
+                        <option name="os0" id="os0" value="LadiesL">Ladies' L</option>
+                         <option name="os0" id="os0" value="LadiesXL">Ladies' XL</option>
                       </select><br/></span>
                       <label for="publicAck"><strong>
                           Should we <a href="/sponsors#supporters">list you publicly</a> as a Conservancy Supporter? </strong></label>
-                      <input type="hidden" name="on2" value="publicAck" />
-                      <input type="radio" checked="checked" name="os2" value="Yes" />Yes
-                      <input type="radio" name="os2" value="No" />No<br/>
+                      <input type="radio" checked="checked" name="on1" value="publicAckYes" />Yes
+                      <input type="radio" name="on1" value="publicAckNo" />No<br/>
             
                       <label for="joinList"><strong>Join Conservancy's
                       Low-Traffic Announcement Email List? </strong></label>
-                      <input type="hidden" name="on4" value="joinList" />
-                      <input type="radio" checked="checked" name="os4" value="Yes" />Yes
-                      <input type="radio" name="os4" value="No" />No<br>
+                      <input type="radio" checked="checked" name="os1" value="joinListYes" />Yes
+                      <input type="radio" name="os1" value="joinListNo" />No<br>
                       <br /></div>
                       <div id="annual" class="supporter-form-submit">
                       <input type="image"
@@ -221,34 +217,30 @@ internal policies</a> are published and available for scrutiny.</p>
   <span id="error" class="form-error-show">$10/month is a minimum for Conservancy
   Supporters.  <a href="/donate">Donate smaller amounts here</a>.</span><br/>
                       <label for="wantGift"><strong>Do you want to receive a t-shirt? </strong></label>
-                      <input type="hidden" name="on1" value="wantGift" />
-                      <input type="radio" name="os1" value="Yes" />Yes
-                      <input type="radio" checked="checked" name="os1" value="No" />No
+                      <input type="radio" name="on0" value="wantGiftYes" />Yes
+                      <input type="radio" checked="checked" name="on0" value="wantGiftNo" />No
                       <br />
                       <span class="t-shirt-size-selector">
-                      <label for="wantGift"><strong>T-shirt size: </strong></label>
-                      <input type="hidden" name="on3" value="size"/>
-                      <select name="os3" id="os3">
-                        <option name="os3" id="os3" value="MenS">Men's S</option>
-                        <option name="os3" id="os3" value="MenM">Men's M</option>
-                        <option name="os3" id="os3" value="MenL">Men's L</option>
-                        <option name="os3" id="os3" value="MenXL">Men's XL</option>
-                        <option name="os3" id="os3" value="Men2XL">Men's 2XL</option>
-                        <option name="os3" id="os3" value="LadiesS">Ladies' S</option>
-                        <option name="os3" id="os3" value="LadiesM">Ladies' M</option>
-                        <option name="os3" id="os3" value="LadiesL">Ladies' L</option>
-                         <option name="os3" id="os3" value="LadiesXL">Ladies' XL</option>
+                      <label for="tShirtSize"><strong>T-shirt size: </strong></label>
+                      <select name="os0" id="os0">
+                        <option name="os0" id="os0" value="MenS">Men's S</option>
+                        <option name="os0" id="os0" value="MenM">Men's M</option>
+                        <option name="os0" id="os0" value="MenL">Men's L</option>
+                        <option name="os0" id="os0" value="MenXL">Men's XL</option>
+                        <option name="os0" id="os0" value="Men2XL">Men's 2XL</option>
+                        <option name="os0" id="os0" value="LadiesS">Ladies' S</option>
+                        <option name="os0" id="os0" value="LadiesM">Ladies' M</option>
+                        <option name="os0" id="os0" value="LadiesL">Ladies' L</option>
+                         <option name="os0" id="os0" value="LadiesXL">Ladies' XL</option>
                       </select><br/></span>
                       <label for="publicAck"><strong>
                           Should we  <a href="/sponsors#supporters">list you publicly</a> as a Conservancy Supporter? </strong></label>
-                      <input type="hidden" name="on2" value="publicAck" />
-                      <input type="radio" checked="checked" name="os2" value="Yes" />Yes
-                      <input type="radio" name="os2" value="No" />No<br/>
+                      <input type="radio" checked="checked" name="on1" value="publicAckYes" />Yes
+                      <input type="radio" name="on1" value="publicAckNo" />No<br/>
                       <label for="joinList"><strong>Join Conservancy's
                       Low-Traffic Announcement Email List? </strong></label>
-                      <input type="hidden" name="on4" value="joinList" />
-                      <input type="radio" checked="checked" name="os4" value="Yes" />Yes
-                      <input type="radio" name="os4" value="No" />No<br>
+                      <input type="radio" checked="checked" name="os1" value="joinListYes" />Yes
+                      <input type="radio" name="os1" value="joinListNo" />No<br>
                       <br /></div>
                       <div id="monthly" class="supporter-form-submit">
                       <input type="image"