diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 3d2966d8e2b3..5c619ea9b756 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1465,9 +1465,10 @@
         }
 
         @if (Auth::user()->canCreateOrEdit(ENTITY_INVOICE, $invoice))
-            if ($('#saveButton').is(':disabled')) {
-                return false;
-            }
+			if (NINJA.formIsSubmitted) {
+				return false;
+			}
+			NINJA.formIsSubmitted = true;
             $('#saveButton, #emailButton, #draftButton').attr('disabled', true);
             // if save fails ensure user can try again
             $.post('{{ url($url) }}', $('.main-form').serialize(), function(data) {
@@ -1489,6 +1490,7 @@
 	function handleSaveFailed(data) {
 		$('#saveButton, #emailButton, #draftButton').attr('disabled', false);
 		$('#emailModal div.modal-footer button').attr('disabled', false);
+		NINJA.formIsSubmitted = false;
 		var error = '';
 		if (data) {
 			var error = firstJSONError(data.responseJSON) || data.statusText;
diff --git a/resources/views/payments/braintree/credit_card.blade.php b/resources/views/payments/braintree/credit_card.blade.php
index ad0878989379..0683808ed7f1 100644
--- a/resources/views/payments/braintree/credit_card.blade.php
+++ b/resources/views/payments/braintree/credit_card.blade.php
@@ -36,6 +36,8 @@
                 },
                 onError: function(e) {
                     $form.find('button').prop('disabled', false);
+                    NINJA.formIsSubmitted = false;
+                    
                     // Show the errors on the form
                     if (e.details && e.details.invalidFieldKeys.length) {
                         var invalidField = e.details.invalidFieldKeys[0];
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php
index 9bdd198c82a4..6a81c46b9c12 100644
--- a/resources/views/payments/edit.blade.php
+++ b/resources/views/payments/edit.blade.php
@@ -227,6 +227,10 @@
             var amount = $('#amount').val();
 
             if (NINJA.parseFloat(amount) <= invoice.balance || confirm("{{ trans('texts.amount_greater_than_balance') }}")) {
+                if (NINJA.formIsSubmitted) {
+        			return false;
+        		}
+        		NINJA.formIsSubmitted = true;
                 $('#saveButton').attr('disabled', true);
                 return true;
             } else {
diff --git a/resources/views/payments/stripe/bank_transfer.blade.php b/resources/views/payments/stripe/bank_transfer.blade.php
index 2925b501ac94..ceac49b109d2 100644
--- a/resources/views/payments/stripe/bank_transfer.blade.php
+++ b/resources/views/payments/stripe/bank_transfer.blade.php
@@ -14,11 +14,6 @@
                 }
 
                 event.preventDefault();
-                if (NINJA.formIsSubmitted) {
-                    return false;
-                }
-                NINJA.formIsSubmitted = true;
-
                 var $form = $(this);
 
                 var data = {
@@ -52,6 +47,11 @@
                     return false;
                 }
 
+                if (NINJA.formIsSubmitted) {
+                    return false;
+                }
+                NINJA.formIsSubmitted = true;
+
                 // Disable the submit button to prevent repeated clicks
                 $form.find('button').prop('disabled', true);
                 $('#js-error-message').hide();
@@ -98,6 +98,7 @@
                     error = "{{trans('texts.country_not_supported')}}";
                 }
                 $form.find('button').prop('disabled', false);
+                NINJA.formIsSubmitted = false;
                 $('#js-error-message').html(error).fadeIn();
             } else {
                 // response contains id and card, which contains additional card details
diff --git a/resources/views/payments/stripe/credit_card.blade.php b/resources/views/payments/stripe/credit_card.blade.php
index 9ae03559466d..1995c6f7c781 100644
--- a/resources/views/payments/stripe/credit_card.blade.php
+++ b/resources/views/payments/stripe/credit_card.blade.php
@@ -10,10 +10,6 @@
             $(function() {
                 $('.payment-form').unbind('submit').submit(function(event) {
                     event.preventDefault();
-                    if (NINJA.formIsSubmitted) {
-                        return false;
-                    }
-                    NINJA.formIsSubmitted = true;
 
                     if ($('[name=plaidAccountId]').length) {
                         return;
@@ -53,6 +49,11 @@
                         }
                     }
 
+                    if (NINJA.formIsSubmitted) {
+                        return false;
+                    }
+                    NINJA.formIsSubmitted = true;
+
                     // Disable the submit button to prevent repeated clicks
                     $form.find('button').prop('disabled', true);
                     $('#js-error-message').hide();
@@ -72,6 +73,7 @@
                     // Show the errors on the form
                     var error = response.error.message;
                     $form.find('button').prop('disabled', false);
+                    NINJA.formIsSubmitted = false;
                     $('#js-error-message').html(error).fadeIn();
                 } else {
                     // response contains id and card, which contains additional card details
diff --git a/resources/views/payments/wepay/credit_card.blade.php b/resources/views/payments/wepay/credit_card.blade.php
index 911c11d55e52..54e420fce163 100644
--- a/resources/views/payments/wepay/credit_card.blade.php
+++ b/resources/views/payments/wepay/credit_card.blade.php
@@ -12,10 +12,6 @@
             var $form = $('.payment-form');
             $('.payment-form').submit(function(event) {
                 event.preventDefault();
-                if (NINJA.formIsSubmitted) {
-                    return false;
-                }
-                NINJA.formIsSubmitted = true;
 
                 var data = {
                     client_id: {{ WEPAY_CLIENT_ID }},
@@ -49,8 +45,13 @@
                         // Show the errors on the form
                         var error = response.error_description;
                         $form.find('button').prop('disabled', false);
+                        NINJA.formIsSubmitted = false;
                         $('#js-error-message').text(error).fadeIn();
                     } else {
+                        if (NINJA.formIsSubmitted) {
+                            return false;
+                        }
+                        NINJA.formIsSubmitted = true;
                         // response contains id and card, which contains additional card details
                         var token = response.credit_card_id;
                         // Insert the token into the form so it gets submitted to the server
@@ -64,6 +65,7 @@
                     // Show the errors on the form
                     var error = response.error_description;
                     $form.find('button').prop('disabled', false);
+                    NINJA.formIsSubmitted = false;
                     $('#js-error-message').text(error).fadeIn();
                 }