diff --git a/views/supporter/_signupcode.erb b/views/supporter/_signupcode.erb
index 011678c8..0104059f 100644
--- a/views/supporter/_signupcode.erb
+++ b/views/supporter/_signupcode.erb
@@ -6,42 +6,33 @@
 <script>
   Stripe.setPublishableKey('<%= $config['stripe_publishable_key'] %>')
 
+  $(document).ready(function() {
+    $('#upgradeForm').submit(function(event) {
+      event.preventDefault();
 
-  $('#upgradeForm').submit(function(event) {
-    if($('#stripe_token').val() != '')
-      return true
-
-    var signupform = $(event.target)
-
-    var planError = $('#plan_error')
-    planError.css('display', 'none')
-    signupform.find(':submit').prop('disabled', true)
-
-    Stripe.card.createToken({
-      number: $('[name="cc_number"]').val(),
-      cvc: $('[name="cc_cvc"]').val(),
-      exp_month: $('[name="cc_exp_month"]').val(),
-      exp_year: $('[name="cc_exp_year"]').val()
-    }, function(status, response) {
-      if(response.error) {
-        planError.text(response.error.message)
-        planError.css('display', 'block')
-        window.location = '#plan_error_link'
-        signupform.find(':submit').prop('disabled', false)
-        return false
+      if ($('#stripe_token').val() === '') {
+        Stripe.card.createToken({
+          number: $('[name="cc_number"]').val(),
+          cvc: $('[name="cc_cvc"]').val(),
+          exp_month: $('[name="cc_exp_month"]').val(),
+          exp_year: $('[name="cc_exp_year"]').val()
+        }, stripeResponseHandler);
+        return false;
       } else {
-        $('.credit-card-input').text('Thank you!')
-        $('#stripe_token').val(response.id)
-        signupform.submit()
+        return true;
       }
-    })
+    });
 
-    return false
-  })
-
-  $(function() {
-    $('#upgradeForm').find(':submit').prop('disabled', false)
-  })
+    function stripeResponseHandler(status, response) {
+      if (response.error) {
+        $('#plan_error').text(response.error.message).show();
+      } else {
+        var token = response.id;
+        $('#stripe_token').val(token);
+        $('#upgradeForm').off('submit').submit();
+      }
+    }
+  });
 </script>
 
-<script src="/js/skeuocard.min.js"></script>
+<script src="/js/skeuocard.min.js"></script>
\ No newline at end of file