diff --git a/booking.stripe.js b/booking.stripe.js
index 8a2d79a..0fe2f4c 100644
--- a/booking.stripe.js
+++ b/booking.stripe.js
@@ -1,18 +1,29 @@
 jQuery(document).ready(function($) {
     var settings = Drupal.settings.booking_stripe;
-    var $form = $("#" + settings.form_selector);
+    var $stripeForm = $("#" + settings.form_selector);
     var handler = StripeCheckout.configure({
         key: settings.pubkey,
         image: settings.image,
         locale: 'auto',
         token: function(token) {
+            try {
+                var $token_id = $(':input[name="token_id"]', $stripeForm);
+                var $token_email = $(':input[name="token_email"]', $stripeForm);
+                $token_id.val(token.id);
+                $token_email.val(token.email);
+                $stripeForm.get(0).submit();
+            }
+            catch(err) {
+              console.log([err]);
+            }
+
             // Use the token to create the charge with a server-side script.
             // You can access the token ID with `token.id`
-            if (currentForm === undefined)
-                return;
-            currentForm.find('input[name="token_id"]').val(token.id);
-            currentForm.find('input[name="token_email"]').val(token.email);
-            currentForm.submit();
+            //if (currentForm === undefined)
+            //    return;
+            //currentForm.find('input[name="token_id"]').val(token.id);
+            //currentForm.find('input[name="token_email"]').val(token.email);
+            //currentForm.submit();
         }
     });
     var currentForm = undefined;