diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index a34238b05bf40aeb5af9262c28f677bbeace51e9..d01d22f16a2f4756a5c53a446b94605acc027ed4 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -50,8 +50,8 @@
    avoid hibernating its enforcement efforts.
 {% else %}
       <em>Conservancy will continue our basic community services, thanks to our
-        first <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters! However, we still need a total of
-        <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> Supporters to avoid reducing licensing work &amp; hibernating our
+        first <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters! We still need
+        <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }}</span> more Supporters to avoid reducing licensing work &amp; hibernating our
         enforcement efforts.
 {% endif %}
 {% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %}
@@ -67,7 +67,7 @@ Thus, our 750 goal was achieved &amp; {{ sitefundgoal.fundraiser_so_far_amount|s
     joined beyond that.
 {% endif %}
 {% if sitefundgoal.fundraiser_donation_count_disclose_threshold > 0 %}
-Also, match pledges reduced our 2,500 maximum need by <span id="site-fundraiser-match-count">{{ sitefundgoal.fundraiser_donation_count_disclose_threshold|min:632|intcomma }}</span>
+Also, match pledges reduced our <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> maximum need by <span id="site-fundraiser-match-count">{{ sitefundgoal.fundraiser_donation_count_disclose_threshold|min:632|intcomma }}</span>
 {% endif %}
 !</div></a>
 </div>