diff --git a/src/pretix/plugins/paypal2/payment.py b/src/pretix/plugins/paypal2/payment.py
index c1cc7d6e43..adeb2c41e4 100644
--- a/src/pretix/plugins/paypal2/payment.py
+++ b/src/pretix/plugins/paypal2/payment.py
@@ -548,8 +548,8 @@ class PaypalMethod(BasePaymentProvider):
                         'value': value,
                     },
                     'payee': payee,
-                    'description': description,
-                    'custom_id': custom_id,
+                    'description': description[:127],
+                    'custom_id': custom_id[:127],
                     # 'shipping': {},  # Include Shipping information?
                 }],
                 'application_context': {
@@ -610,31 +610,33 @@ class PaypalMethod(BasePaymentProvider):
 
             if pp_captured_order.status == 'APPROVED':
                 try:
+                    custom_id = '{prefix}{orderstring}{postfix}'.format(
+                        prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
+                        orderstring=__('Order {slug}-{code}').format(
+                            slug=self.event.slug.upper(),
+                            code=payment.order.code
+                        ),
+                        postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
+                    )
+                    description = '{prefix}{orderstring}{postfix}'.format(
+                        prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
+                        orderstring=__('Order {order} for {event}').format(
+                            event=request.event.name,
+                            order=payment.order.code
+                        ),
+                        postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
+                    )
                     patchreq = OrdersPatchRequest(pp_captured_order.id)
                     patchreq.request_body([
                         {
                             "op": "replace",
                             "path": "/purchase_units/@reference_id=='default'/custom_id",
-                            "value": '{prefix}{orderstring}{postfix}'.format(
-                                prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
-                                orderstring=__('Order {slug}-{code}').format(
-                                    slug=self.event.slug.upper(),
-                                    code=payment.order.code
-                                ),
-                                postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
-                            ),
+                            "value": custom_id[:127],
                         },
                         {
                             "op": "replace",
                             "path": "/purchase_units/@reference_id=='default'/description",
-                            "value": '{prefix}{orderstring}{postfix}'.format(
-                                prefix='{} '.format(self.settings.prefix) if self.settings.prefix else '',
-                                orderstring=__('Order {order} for {event}').format(
-                                    event=request.event.name,
-                                    order=payment.order.code
-                                ),
-                                postfix=' {}'.format(self.settings.postfix) if self.settings.postfix else ''
-                            ),
+                            "value": description[:127],
                         }
                     ])
                     self.client.execute(patchreq)
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 f1e8d0f238..0b24efb106 100644
--- a/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
+++ b/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
@@ -70,6 +70,7 @@ var pretixpaypal = {
             pretixpaypal.paypage = Boolean($('#paypal-button-container').data('paypage'));
             pretixpaypal.order_id = $.trim($("#paypal_oid").html());
             pretixpaypal.currency = $("body").attr("data-currency");
+            pretixpaypal.locale = $("body").attr("data-locale") + "_" + $("body").attr("data-datetimelocale").toUpperCase();
         }
 
         pretixpaypal.continue_button.prop("disabled", true);
@@ -82,6 +83,7 @@ var pretixpaypal = {
             '?client-id=' + pretixpaypal.client_id +
             '&components=buttons,funding-eligibility' +
             '&currency=' + pretixpaypal.currency;
+            //'&locale=' + pretixpaypal.locale;
 
         if (pretixpaypal.merchant_id) {
             sdk_url += '&merchant-id=' + pretixpaypal.merchant_id;