diff --git a/payments/templates/includes/braintree_checkout.js b/payments/templates/includes/braintree_checkout.js
index 96bc9c3..6e6ec4c 100644
--- a/payments/templates/includes/braintree_checkout.js
+++ b/payments/templates/includes/braintree_checkout.js
@@ -42,6 +42,14 @@ $(document).ready(function() {
 				})
 			});
 		});
+
+		instance.on('paymentMethodRequestable', function (event) {
+			button.removeAttribute('disabled');
+		});
+
+		instance.on('noPaymentMethodRequestable', function () {
+			button.setAttribute('disabled', true);
+		});
 	});
 
 })
diff --git a/payments/templates/pages/braintree_checkout.html b/payments/templates/pages/braintree_checkout.html
index a9fec0e..bdc7b46 100644
--- a/payments/templates/pages/braintree_checkout.html
+++ b/payments/templates/pages/braintree_checkout.html
@@ -26,7 +26,7 @@
 				</div>
 			</section>
 
-			<button class="btn btn-primary" type="submit" id="submit-button"><span>{{ _("Pay") }} {{ amount }} {{ currency }}</span></button>
+			<button class="btn btn-primary" type="submit" id="submit-button" disabled><span>{{ _("Pay") }} {{ amount }} {{ currency }}</span></button>
 		</form>
 
 	</div>
diff --git a/payments/templates/pages/payment-success.html b/payments/templates/pages/payment-success.html
index a1b5092..ce382cd 100644
--- a/payments/templates/pages/payment-success.html
+++ b/payments/templates/pages/payment-success.html
@@ -15,4 +15,13 @@
 <style>
 {% include "templates/styles/card_style.css" %}
 </style>
+<script>
+	frappe.ready(function() {
+		if('{{ frappe.form_dict.redirect_to or "" }}'){
+			setTimeout(function(){
+				window.location.href = '{{ frappe.form_dict.redirect_to }}';
+			}, 6000);
+		}
+	})
+</script>
 {% endblock %}