diff --git a/src/pretix/plugins/paypal2/payment.py b/src/pretix/plugins/paypal2/payment.py
index 505a671d0..bee42ad79 100644
--- a/src/pretix/plugins/paypal2/payment.py
+++ b/src/pretix/plugins/paypal2/payment.py
@@ -582,7 +582,7 @@ class PaypalMethod(BasePaymentProvider):
         on the 'confirm order' page.
         """
         template = get_template('pretixplugins/paypal2/checkout_payment_confirm.html')
-        ctx = {'request': request, 'event': self.event, 'settings': self.settings}
+        ctx = {'request': request, 'event': self.event, 'settings': self.settings, 'method': self.method}
         return template.render(ctx)
 
     def execute_payment(self, request: HttpRequest, payment: OrderPayment):
diff --git a/src/pretix/plugins/paypal2/signals.py b/src/pretix/plugins/paypal2/signals.py
index a35c458db..e37d50143 100644
--- a/src/pretix/plugins/paypal2/signals.py
+++ b/src/pretix/plugins/paypal2/signals.py
@@ -107,6 +107,7 @@ def html_head_presale(sender, request=None, **kwargs):
 
     if provider.settings.get('_enabled', as_type=bool) and (
             url.url_name == "event.order.pay.change" or
+            url.url_name == "event.order.pay" or
             (url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or
             (url.namespace == "plugins:paypal2" and url.url_name == "pay")
     ):
@@ -137,6 +138,7 @@ def signal_process_response(sender, request: HttpRequest, response: HttpResponse
 
     if provider.settings.get('_enabled', as_type=bool) and (
             url.url_name == "event.order.pay.change" or
+            url.url_name == "event.order.pay" or
             (url.url_name == "event.checkout" and url.kwargs['step'] == "payment") or
             (url.namespace == "plugins:paypal2" and url.url_name == "pay")
     ):
diff --git a/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js b/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
index adf3816ca..20acd921c 100644
--- a/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
+++ b/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
@@ -141,11 +141,11 @@ var pretixpaypal = {
             pretixpaypal.restore();
         });
 
-        if ($("input[name=payment][value^='paypal']").is(':checked') || $(".payment-redo-form").length) {
+        if ($("input[name=payment][value^='paypal']").is(':checked')) {
             pretixpaypal.renderButton($("input[name=payment][value^='paypal']:checked").val());
-        }
-
-        if ($('#paypal-button-container').data('paypage')) {
+        } else if ($(".payment-redo-form").length) {
+            pretixpaypal.renderButton($("input[name=payment][value^='paypal']").val());
+        } else if ($('#paypal-button-container').data('paypage')) {
             pretixpaypal.renderButton('paypal_apm');
         }
     },