diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 06b692b6c6..3c012c229a 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -3,7 +3,7 @@
 require "csv"
 
 class RegistrationsController < ApplicationController
-  before_action :authenticate_user!, except: [:create, :index, :psych_sheet, :psych_sheet_event, :register, :stripe_webhook, :stripe_denomination, :create_paypal_order]
+  before_action :authenticate_user!, except: [:create, :index, :psych_sheet, :psych_sheet_event, :register, :stripe_webhook, :payment_denomination, :create_paypal_order]
   # Stripe has its own authenticity mechanism with Webhook Secrets.
   protect_from_forgery except: [:stripe_webhook]
 
@@ -20,10 +20,10 @@ class RegistrationsController < ApplicationController
   end
 
   before_action -> { redirect_to_root_unless_user(:can_manage_competition?, competition_from_params) },
-                except: [:create, :index, :psych_sheet, :psych_sheet_event, :register, :payment_completion, :load_payment_intent, :stripe_webhook, :stripe_denomination, :destroy,
+                except: [:create, :index, :psych_sheet, :psych_sheet_event, :register, :payment_completion, :load_payment_intent, :stripe_webhook, :payment_denomination, :destroy,
                          :update, :create_paypal_order, :capture_paypal_payment, :refund_paypal_payment]
 
-  before_action :competition_must_be_using_wca_registration!, except: [:import, :do_import, :add, :do_add, :index, :psych_sheet, :psych_sheet_event, :stripe_webhook, :stripe_denomination]
+  before_action :competition_must_be_using_wca_registration!, except: [:import, :do_import, :add, :do_add, :index, :psych_sheet, :psych_sheet_event, :stripe_webhook, :payment_denomination]
   private def competition_must_be_using_wca_registration!
     if !competition_from_params.use_wca_registration?
       flash[:danger] = I18n.t('registrations.flash.not_using_wca')
@@ -442,16 +442,19 @@ def register
     end
   end
 
-  def stripe_denomination
+  def payment_denomination
     ruby_denomination = params.require(:amount)
     currency_iso = params.require(:currency_iso)
 
-    stripe_amount = StripeRecord.amount_to_stripe(ruby_denomination, currency_iso.downcase)
-
     ruby_money = Money.new(ruby_denomination, currency_iso)
     human_amount = helpers.format_money(ruby_money)
 
-    render json: { stripe_amount: stripe_amount, human_amount: human_amount }
+    api_amounts = {
+      stripe: StripeRecord.amount_to_stripe(ruby_denomination, currency_iso),
+      paypal: PaypalRecord.paypal_amount(ruby_denomination, currency_iso),
+    }
+
+    render json: { api_amounts: api_amounts, human_amount: human_amount }
   end
 
   # Respond to asynchronous payment updates from Stripe.
@@ -743,18 +746,21 @@ def create
   def create_paypal_order
     return head :forbidden if PaypalInterface.paypal_disabled?
 
-    @registration = registration_from_params
-    render json: PaypalInterface.create_order(@registration, params[:total_charge])
+    registration = registration_from_params
+    amount = params.require(:amount)
+
+    render json: PaypalInterface.create_order(registration, amount)
   end
 
   def capture_paypal_payment
     return head :forbidden if PaypalInterface.paypal_disabled?
 
-    @registration = registration_from_params
-    @competition = @registration.competition
-    order_id = params[:order_id]
+    registration = registration_from_params
+    competition = registration.competition
 
-    response = PaypalInterface.capture_payment(@competition, order_id)
+    order_id = params.require(:orderID)
+
+    response = PaypalInterface.capture_payment(competition, order_id)
     if response['status'] == 'COMPLETED'
 
       # TODO: Handle the case where there are multiple captures for a payment
@@ -780,11 +786,11 @@ def capture_paypal_payment
       )
 
       # Record the payment
-      @registration.record_payment(
+      registration.record_payment(
         amount,
         currency_code,
         record, # TODO: Add error handling for the PaypalRecord not being found
-        @registration.user.id,
+        registration.user.id,
       )
     end
 
diff --git a/app/views/registrations/_paypal_payment_form.html.erb b/app/views/registrations/_paypal_payment_form.html.erb
index 00e245fa5f..771674740b 100644
--- a/app/views/registrations/_paypal_payment_form.html.erb
+++ b/app/views/registrations/_paypal_payment_form.html.erb
@@ -20,48 +20,28 @@
   <%= f.input :subtotal, label: t('registrations.payment_form.labels.subtotal'), hint: false do %>
     <p class="form-control-static" id="money-subtotal"><%= format_money(@registration.outstanding_entry_fees) %></p>
   <% end %>
-  <div id="stripe-elements">
+  <div id="paypal-buttons">
     <%= f.input :payment_information, label: t("registrations.payment_form.labels.payment_information"), hint: false, wrapper_html: { id: 'payment-element-wrapper' } do %>
-      <div id="payment-element"></div>
+      <div id="payment-buttons"></div>
     <% end %>
-    <%= f.input :payment_service_error, label: t('registrations.payment_form.labels.payment_service_error'), hint: false, wrapper_html: { id: 'payment-service-error-wrapper', class: 'text-danger' } do %>
+    <%= f.input :payment_service_error, label: t('registrations.payment_form.labels.payment_service_error'), hint: false, wrapper_html: { id: 'paypal-error-wrapper', class: 'text-danger' } do %>
+      <p class="form-control-static" id="paypal-sdk-error"></p>
     <% end %>
   </div>
 
-
-
   <% merchant_id = @competition.payment_account_for(:paypal).paypal_merchant_id %>
-  <script src="https://www.paypal.com/sdk/js?client-id=<%= AppSecrets.PAYPAL_CLIENT_ID%>&merchant-id=<%= merchant_id %>&currency=<%= @registration.outstanding_entry_fees.currency.iso_code %>"></script>
+  <% currency_iso = @registration.outstanding_entry_fees.currency.iso_code %>
 
-  <script>
+  <script src="https://www.paypal.com/sdk/js?client-id=<%= AppSecrets.PAYPAL_CLIENT_ID%>&merchant-id=<%= merchant_id %>&currency=<%= currency_iso %>"></script>
 
+  <script>
     // ----------
     // I18N and currency code data
     // ----------
 
-    // From https://stripe.com/docs/js/appendix/supported_locales
-    const supported_locales = ['ar', 'bg', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es', 'es-419', 'et', 'fi', 'fil', 'fr', 'fr-CA', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'ms', 'mt', 'nb', 'nl', 'pl', 'pt-BR', 'pt', 'ro', 'ru', 'sk', 'sl', 'sv', 'th', 'tr', 'vi', 'zh', 'zh-HK', 'zh-TW'];
-    const wca_locale = '<%= I18n.locale %>';
-
     const pendingAmountRuby = parseInt('<%= @registration.outstanding_entry_fees.cents %>');
     const currencyIsoCode = '<%= @registration.outstanding_entry_fees.currency.iso_code %>';
 
-    // ----------
-    // Init Stripe PaymentElement
-    // ----------
-
-
-    // deferred payment (show the PaymentElement without pre-loading a PaymentIntent)
-    // as per https://stripe.com/docs/payments/accept-a-payment-deferred?type=payment
-
-    const $paymentButton = $('#payment-button');
-    $paymentButton.on('click', function(e) {
-      e.preventDefault();
-
-      toggleSaving(true);
-      processPayment();
-    });
-
     // ----------
     // Init jQuery variables and reset their state
     // ----------
@@ -69,8 +49,8 @@
     const $ajaxErrorRow = $('#wca-error-wrapper');
     $ajaxErrorRow.hide();
 
-    const $stripeErrorRow = $('#stripe-error-wrapper');
-    $stripeErrorRow.hide();
+    const $paypalErrorRow = $('#paypal-error-wrapper');
+    $paypalErrorRow.hide();
 
     const $paymentElementRow = $('#payment-element-wrapper');
     $paymentElementRow.removeClass("has-error");
@@ -90,15 +70,12 @@
     // ----------
 
     function toggleSaving(saving) {
-      $paymentButton.prop("disabled", saving);
-      $paymentButton.toggleClass("saving", saving);
-
       $donationInputField.prop("disabled", saving);
       $donationInputField.toggleClass("saving", saving);
 
       if (saving) {
         $ajaxErrorRow.hide();
-        $stripeErrorRow.hide();
+        $paypalErrorRow.hide();
 
         $paymentElementRow.removeClass("has-error");
       }
@@ -108,31 +85,40 @@
     // Init PayPal PaymentElement
     // ----------
 
-    paypal.Buttons({
+    function wrapAjaxPromise(queryKey, settings) {
+      return new Promise((resolve, reject) => {
+        window.wca.cancelPendingAjaxAndAjax(queryKey, {
+          ...settings,
+          success: resolve,
+          error: reject,
+        })
+      });
+    }
+
+    const paypalButtons = paypal.Buttons({
         // Order is created on the server and the order id is returned
         createOrder: (data, actions) => {
-          return fetch("/registration/<%= @registration.id %>/create-paypal-order/", {
-            method: "post",
-            body: JSON.stringify({ total_charge: getCurrentRubyAmount() }),
-            headers: {
-              'Content-Type': 'application/json' // Set the content type to JSON
-            }
-        })
-        .then((response) => response.json())
-        .then((order) => order.id);
+          const amount = getCurrentRubyAmount();
+
+          return wrapAjaxPromise('load-payment-intent', {
+            url: '<%= registration_create_paypal_order_path(@registration) %>',
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            data: JSON.stringify({ amount: amount }),
+          })
+            .then(({ id: orderId }) => orderId)
+            .catch(handleAjaxError);
         },
 
         // Finalize the transaction on the server after payer approval
         onApprove: (data, actions) => {
-          return fetch(`/registration/<%= @registration.id %>/capture-paypal-payment/${data.orderID}`, {
-            method: "post",
-            body: JSON.stringify({ competition_id: '<%= @competition.id %>' }),
-            headers: {
-              'Content-Type': 'application/json' // Set the content type to JSON
-            }
+          return wrapAjaxPromise('capture-paypal-order', {
+            url: '<%= registration_capture_paypal_payment_path(@registration) %>',
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            data: JSON.stringify(data),
         })
-        .then((response) => response.json())
-        .then((orderData) => {
+          .then((orderData) => {
             // Successful capture! For dev/demo purposes:
             console.log('Capture result', orderData, JSON.stringify(orderData, null, 2));
             const transaction = orderData.purchase_units[0].payments.captures[0];
@@ -142,65 +128,15 @@
             // const element = document.getElementById('paypal-button-container');
             // element.innerHTML = '<h3>Thank you for your payment!</h3>';
             // Or go to another URL:  actions.redirect('thank_you.html');
-        });
-        }
-    }).render('#payment-element');
-
-    // ----------
-    // Two-step workflow to handle payments
-    //   1. Do simple frontend validations - catches cases like bad checksums (aka typos) before they reach our backend
-    //   2. Create a PI and submit it to Stripe for handling
-    // ----------
-
-    async function processPayment() {
-      const amount = getCurrentRubyAmount();
-
-      if (isNaN(amount)) {
-        alert('<%= t("registrations.payment_form.alerts.not_a_number") %>');
-      } else {
-        // Trigger form validation and wallet collection
-        const { error: userInputError } = await elements.submit();
-
-        if (userInputError) {
-          handleStripeError(userInputError);
-        } else {
-          // NOTE: The factor two is tied to the string literal of the confirm message ("You're about to pay more than double")
-          // If you change this threshold, please remember to change the translation string in en.yml!
-          const amountOverThreshold = amount >= (2 * pendingAmountRuby);
-          const confirmedAmount = !amountOverThreshold || confirm('<%= t("registrations.payment_form.alerts.amount_rather_high") %>')
-
-          if (confirmedAmount) {
-            // Fetches a payment intent and captures the client secret
-            window.wca.cancelPendingAjaxAndAjax('load-payment-intent', {
-              url: '<%= registration_payment_intent_path(@registration) %>',
-              method: 'POST',
-              headers: { 'Content-Type': 'application/json' },
-              data: JSON.stringify({ amount: amount }),
-              success: submitPaymentIntent,
-              error: handleAjaxError,
-            });
-          } else {
-            toggleSaving(false);
-          }
-        }
-      }
-    }
+          })
+          .catch(handleAjaxError);
+        },
 
-    async function submitPaymentIntent(data) {
-      const { client_secret: clientSecret } = data;
+        onError: (err) => handlePaypalError(err, false),
+        onCancel: (data) => handlePaypalError(data, true),
+    });
 
-      const { error: stripeBackendError } = await stripe.confirmPayment({
-        elements,
-        clientSecret,
-        confirmParams: {
-          return_url: '<%= registration_payment_completion_url(@registration, host: EnvConfig.ROOT_URL) %>',
-        }
-      });
-
-      if (stripeBackendError) {
-        handleStripeError(stripeBackendError);
-      }
-    }
+    paypalButtons.render('#payment-buttons')
 
     // ----------
     // Error handling
@@ -217,19 +153,21 @@
       $ajaxErrorRow.show();
     }
 
-    function handleStripeError(error) {
+    function handlePaypalError(errPayload, isManualCancel = false) {
       toggleSaving(false);
 
-      const $stripeErrorDiv = $('#stripe-sdk-error');
+      const $paypalErrorDiv = $('#paypal-sdk-error');
 
-      if (error.type === 'card_error' || error.type === 'validation_error') {
-        $stripeErrorDiv.text(error.message);
+      if (isManualCancel) {
+        $paypalErrorDiv.text('<%= t("registrations.payment_form.errors.paypal_canceled") %>');
       } else {
-        $stripeErrorDiv.text('<%= t("registrations.payment_form.errors.stripe_failed") %>');
+        // Quote from the PayPal documentation: (see https://developer.paypal.com/sdk/js/reference/#onerror)
+        // Note: This error handler is a catch-all. Errors at this point aren't expected to be handled beyond showing a generic error message or page.
+        $paypalErrorDiv.text('<%= t("registrations.payment_form.errors.paypal_failed") %>');
       }
 
       $paymentElementRow.addClass("has-error");
-      $stripeErrorRow.show();
+      $paypalErrorRow.show();
     }
 
     // ----------
@@ -239,8 +177,7 @@
     const $donationToggle = $('#toggle-show-donation');
     const $subtotalText = $('#money-subtotal');
 
-    // PI is pre-loaded with the correct amount, no need to update it straight away
-    updateSubtotal;
+    updateSubtotal();
 
     function getCurrentRubyAmount() {
       if ($donationToggle.is(':checked')) {
@@ -255,23 +192,13 @@
     function updateSubtotal() {
       const amount = getCurrentRubyAmount();
 
-      const buttonDisabled = $paymentButton.prop("disabled");
-      const buttonToggled = $paymentButton.hasClass("saving");
-
-      // disable the payment button as long as we're relaying new payment information to Stripe
-      $paymentButton.prop("disabled", true);
-      $paymentButton.toggleClass("saving", true);
-
       window.wca.cancelPendingAjaxAndAjax('refresh-payment-subtotal', {
-        url: '<%= registration_stripe_denomination_path %>',
+        url: '<%= registration_payment_denomination_path %>',
         data: { amount: amount, currency_iso: currencyIsoCode },
         success: function (data) {
-          const { stripe_amount: stripeAmount, human_amount: humanAmount } = data;
+          const { human_amount: humanAmount } = data;
 
           $subtotalText.text(humanAmount);
-
-          $paymentButton.prop("disabled", buttonDisabled);
-          $paymentButton.toggleClass("saving", buttonToggled);
         },
         error: handleAjaxError,
       });
diff --git a/app/views/registrations/_stripe_payment_form.html.erb b/app/views/registrations/_stripe_payment_form.html.erb
index b1935d4744..982d5ae03a 100644
--- a/app/views/registrations/_stripe_payment_form.html.erb
+++ b/app/views/registrations/_stripe_payment_form.html.erb
@@ -248,10 +248,10 @@
       $paymentButton.toggleClass("saving", true);
 
       window.wca.cancelPendingAjaxAndAjax('refresh-payment-subtotal', {
-        url: '<%= registration_stripe_denomination_path %>',
+        url: '<%= registration_payment_denomination_path %>',
         data: { amount: amount, currency_iso: currencyIsoCode },
         success: function (data) {
-          const { stripe_amount: stripeAmount, human_amount: humanAmount } = data;
+          const { api_amounts: { stripe: stripeAmount }, human_amount: humanAmount } = data;
 
           if (refreshStripe) {
             elements.update({ amount: stripeAmount });
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1ccce3cc08..a2193c28a4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1220,6 +1220,8 @@ en:
         already_paid: "The charge was not placed because the registration fees are already paid."
         not_allowed: "You can't pay for that registration."
         stripe_failed: "Please check the Stripe transaction."
+        paypal_failed: "Please check the PayPal order."
+        paypal_canceled: "PayPal reported that the order was manually canceled. Please try again."
         stripe_not_found: "Stripe reported back a transaction ID that couldn't be found."
         stripe_secret_invalid: "Stripe reported back a transaction secret that doesn't match our records."
         payment_reset: "The payment was rejected by Stripe."
diff --git a/config/routes.rb b/config/routes.rb
index 65f7003ef4..06c262f4d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,7 +21,7 @@
   # Don't expose Paypal routes in production until we're reading to launch
   unless PaypalInterface.paypal_disabled?
     post 'registration/:id/create-paypal-order' => 'registrations#create_paypal_order', as: :registration_create_paypal_order
-    post 'registration/:id/capture-paypal-payment/:order_id' => 'registrations#capture_paypal_payment', as: :registration_capture_paypal_payment
+    post 'registration/:id/capture-paypal-payment' => 'registrations#capture_paypal_payment', as: :registration_capture_paypal_payment
     get 'competitions/:id/paypal-return' => 'competitions#paypal_return', as: :competitions_paypal_return
     post 'competitions/:id/disconnect_paypal' => 'competitions#disconnect_paypal', as: :competition_disconnect_paypal
     post 'registration/:id/paypal_refund/:payment_id' => 'registrations#refund_paypal_payment', as: :paypal_payment_refund
@@ -47,7 +47,7 @@
   post 'registration/:id/load-payment-intent' => 'registrations#load_payment_intent', as: :registration_payment_intent
   get 'registration/:id/payment-completion' => 'registrations#payment_completion', as: :registration_payment_completion
   post 'registration/stripe-webhook' => 'registrations#stripe_webhook', as: :registration_stripe_webhook
-  get 'registration/stripe-denomination' => 'registrations#stripe_denomination', as: :registration_stripe_denomination
+  get 'registration/payment-denomination' => 'registrations#payment_denomination', as: :registration_payment_denomination
   resources :users, only: [:index, :edit, :update]
   get 'profile/edit' => 'users#edit'
   post 'profile/enable-2fa' => 'users#enable_2fa'
diff --git a/spec/requests/registrations_spec.rb b/spec/requests/registrations_spec.rb
index 9f76059467..636ad7263c 100644
--- a/spec/requests/registrations_spec.rb
+++ b/spec/requests/registrations_spec.rb
@@ -1084,7 +1084,7 @@
       stub_request(:post, "https://api-m.sandbox.paypal.com/v2/checkout/orders")
         .to_return(status: 200, body: create_order_payload, headers: { 'Content-Type' => 'application/json' })
 
-      payload = { total_charge: competition.base_entry_fee_lowest_denomination, currency_code: competition.currency_code }
+      payload = { amount: competition.base_entry_fee_lowest_denomination, currency_code: competition.currency_code }
       post registration_create_paypal_order_path(registration.id), params: payload
     end
 
@@ -1109,7 +1109,7 @@
         .to_return(status: 200, body: create_order_payload, headers: { 'Content-Type' => 'application/json' })
 
       # Create a PaypalOrder - TODO: maybe we only need to create a PaypalRecord object?
-      payload = { total_charge: competition.base_entry_fee_lowest_denomination, currency_code: competition.currency_code }
+      payload = { amount: competition.base_entry_fee_lowest_denomination, currency_code: competition.currency_code }
       post registration_create_paypal_order_path(registration.id), params: payload
 
       # Stub the create order response
@@ -1122,7 +1122,7 @@
         .to_return(status: 200, body: capture_order_response(@record_id, @amount, @currency_code), headers: { 'Content-Type' => 'application/json' })
 
       # Make the API call to capture the order
-      post registration_capture_paypal_payment_path(registration.id, @record_id), params: {}
+      post registration_capture_paypal_payment_path(registration.id), params: { orderID: @record_id }, as: :json
     end
 
     it 'creates a PaypalRecord of type :capture' do
@@ -1161,7 +1161,7 @@
         .to_return(status: 200, body: create_order_payload, headers: { 'Content-Type' => 'application/json' })
 
       # Create a PaypalOrder - TODO: maybe we only need to create a PaypalRecord object?
-      payload = { total_charge: competition.base_entry_fee_lowest_denomination, currency_code: competition.currency_code }
+      payload = { amount: competition.base_entry_fee_lowest_denomination, currency_code: competition.currency_code }
       post registration_create_paypal_order_path(registration.id), params: payload
 
       # Stub the create order response
@@ -1174,7 +1174,7 @@
         .to_return(status: 200, body: capture_order_response(@record_id, @amount, @currency_code), headers: { 'Content-Type' => 'application/json' })
 
       # Make the API call to capture the order
-      post registration_capture_paypal_payment_path(registration.id, @record_id), params: {}
+      post registration_capture_paypal_payment_path(registration.id), params: { orderID: @record_id }, as: :json
 
       # Mock the refunds endpoint
       capture_id = '7WA034444N6390300' # Defined in the `capture_order_response` payload