diff --git a/www/conservancy/static/js/supporter-page.js b/www/conservancy/static/js/supporter-page.js
index fe68045885b0ccb88dc1674372502bc46ff630d1..d82eec087c3278a617c1635bd631b85c1a6e3ead 100644
--- a/www/conservancy/static/js/supporter-page.js
+++ b/www/conservancy/static/js/supporter-page.js
@@ -19,7 +19,7 @@ var amountIsValid = function(amountInput) {
 }
 
 var supportTypeSelector = function(supportTypeHash) {
-    return $(".supporter-type-selector a[href=" + supportTypeHash + "]");
+    return $(supportTypeHash + "Selector");
 };
 
 var $window = $(window);
@@ -84,12 +84,7 @@ $(document).ready(function() {
         return supportTypeSelector(window.location.hash).click();
     };
     $window.bind("hashchange", selectSupportTypeFromHash);
-    var $selectorLink = selectSupportTypeFromHash();
-    if (parseFloat($("#annual form").data('upgradeFromAmount')) > 0) {
-        supportTypeSelector("#annual").click();
-        $(".supporter-type-selector").hide();
-    }
-    else if ($selectorLink.length === 0) {
+    if (selectSupportTypeFromHash().length === 0) {
         supportTypeSelector("#annual").click();
     }
 });
diff --git a/www/conservancy/templates/supporter/index.html b/www/conservancy/templates/supporter/index.html
index 52d71a98525ae1f3d0ff120a8067e9e505103db9..68213409edd2641c8ad16a4280f1a4d728b8c70c 100644
--- a/www/conservancy/templates/supporter/index.html
+++ b/www/conservancy/templates/supporter/index.html
@@ -54,15 +54,23 @@
   <h1 class="appeal"><img class="appeal-header" alt="Become a Conservancy Supporter!" src="/img/conservancy-supporter-header.png"/></h1>
 
   
-<div class="supporter-type-selector">
-  <strong>Become a Supporter Now:</strong>   <a id="annualSelector" href="#annual">Annual</a> | <a id="monthlySelector" href="#monthly">Monthly</a> | <a id="renewalSelector" href="#renewal">Annual Renew</a></div>
-
-{% include "supporter/form_partial.html" with form_id="annual" min_amt=minimum_amount partial_amt=partial_amount article="an" only %}
-
-{% include "supporter/form_partial.html" with form_id="monthly" min_amt=10 only %}
-
-<a name="renew" class="hidden"></a>
-{% include "supporter/form_partial.html" with form_id="renewal" min_amt=120 verb="renew" article="an" supptype="annual" only %}
+{% if partial_amount > 0 %}
+  {% include "supporter/form_partial.html" with form_id="annual" min_amt=minimum_amount partial_amt=partial_amount article="an" only %}
+{% else %}
+  <div class="supporter-type-selector">
+    <strong>Become a Supporter Now:</strong>
+    <a id="annualSelector" href="#annual">Annual</a>
+    | <a id="monthlySelector" href="#monthly">Monthly</a>
+    | <a id="renewalSelector" href="#renewal">Annual Renew</a>
+  </div>
+
+  {% include "supporter/form_partial.html" with form_id="annual" min_amt=120 article="an" only %}
+
+  {% include "supporter/form_partial.html" with form_id="monthly" min_amt=10 only %}
+
+  <a name="renew" class="hidden"></a>
+  {% include "supporter/form_partial.html" with form_id="renewal" min_amt=120 verb="renew" article="an" supptype="annual" only %}
+{% endif %}
 
 <span id="form-correction-needed" class="form-error">Please ensure all form data above is correct.</span>