diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb
index 0bc1a64..04b9443 100644
--- a/app/controllers/discourse_donations/charges_controller.rb
+++ b/app/controllers/discourse_donations/charges_controller.rb
@@ -30,12 +30,12 @@ module DiscourseDonations
       payment = DiscourseDonations::Stripe.new(secret_key, stripe_options)
 
       if params['amount'].present?
-        charge = payment.charge(email, params)
+        charge = payment.subscribe(email, { plan: params[:amount] })
       else
         charge = payment.subscribe(email, params)
       end
 
-      if (params['amount'].present? && charge['paid'] == true) || charge['status'] == 'active'
+      if charge['paid'] == true || charge['status'] == 'active'
         output['messages'] << I18n.t('donations.payment.success')
 
         output['rewards'] << { type: :group, name: group_name } if group_name
diff --git a/assets/javascripts/discourse/components/stripe-card.js.es6 b/assets/javascripts/discourse/components/stripe-card.js.es6
index 05cf102..ed66a48 100644
--- a/assets/javascripts/discourse/components/stripe-card.js.es6
+++ b/assets/javascripts/discourse/components/stripe-card.js.es6
@@ -9,12 +9,12 @@ export default Ember.Component.extend({
   params: alias('routing.router.currentState.routerJsState.fullQueryParams'),
 
   donateAmounts: [
-    { value: 1, name: '$1.00'},
-    { value: 2, name: '$2.00'},
-    { value: 5, name: '$5.00'},
-    { value: 10, name: '$10.00'},
-    { value: 20, name: '$20.00'},
-    { value: 50, name: '$50.00'}
+    { value: 'consumer-defender-1', name: 'Consumer Defender: $1.00'},
+    { value: 'consumer-defender-2', name: 'Consumer Defender: $2.00'},
+    { value: 'consumer-defender-5', name: 'Consumer Defender: $5.00'},
+//    { value: 10, name: '$10.00'},
+//    { value: 20, name: '$20.00'},
+//    { value: 50, name: '$50.00'}
   ],
   result: [],
   amount: null,
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index 0e59029..1beb15d 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -1,17 +1,5 @@
 <form id="payment-form" class="form-horizontal">
 
-  <!--
-  <div class="control-group">
-    <label class="control-label" for="card-element">
-      {{i18n 'discourse_donations.amount'}}
-      {{settings.discourse_donations_currency}}
-    </label>
-    <div class="controls controls-dropdown">
-      {{combo-box valueAttribute="value" content=donateAmounts value=amount}}
-    </div>
-  </div>
-  -->
-
     {{#if consumerDefenderWithMembership}}
 
     <h3>[$25/quarter] Consumer Defender + CHOICE Membership</h3>
@@ -24,6 +12,27 @@
       <li>CHOICE Members Only area</li>
     </ul>
 
+    {{else}}
+
+    <h3>[Pay what you want/quarter] Consumer Defender only</h3>
+
+    <ul>
+      <li>Choice.community Access</li>
+      <li>Defender Badge (while supplies last)</li>
+      <li>Priority Expert Advice</li>
+    </ul>
+
+
+    <div class="control-group">
+      <label class="control-label" for="card-element">
+        {{i18n 'discourse_donations.amount'}}
+        {{settings.discourse_donations_currency}}
+      </label>
+      <div class="controls controls-dropdown">
+        {{combo-box valueAttribute="value" content=donateAmounts value=amount}}
+      </div>
+    </div>
+
     {{/if}}
 
   <hr>