diff --git a/src/Resources/app/administration/src/module/extension/index.ts b/src/Resources/app/administration/src/module/extension/index.ts
index 4f8d1c722..683fc247b 100644
--- a/src/Resources/app/administration/src/module/extension/index.ts
+++ b/src/Resources/app/administration/src/module/extension/index.ts
@@ -1,4 +1,8 @@
-Shopware.Component.override('sw-first-run-wizard-paypal-credentials', () => import('./sw-first-run-wizard/sw-first-run-wizard-paypal-credentials'));
+if (Shopware.Feature.isActive('PAYPAL_SETTINGS_TWEAKS')) {
+    Shopware.Component.override('sw-first-run-wizard-paypal-credentials', () => import('./sw-first-run-wizard/sw-first-run-wizard-paypal-credentials'));
+} else {
+    Shopware.Component.override('sw-first-run-wizard-paypal-credentials', () => import('./sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated'));
+}
 
 Shopware.Component.override('sw-sales-channel-modal-detail', () => import('./sw-sales-channel-modal-detail'));
 
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/de-DE.json b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/de-DE.json
index bc8128dd3..c8e9b6381 100644
--- a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/de-DE.json
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/de-DE.json
@@ -1,6 +1,7 @@
 {
     "swag-paypal-frw-credentials": {
         "buttonGetCredentials": "Hole API Zugangsdaten",
+        "buttonGetSandboxCredentials": "Hole Sandbox API Zugangsdaten",
         "textIntroPayPal": "Um PayPal zu nutzen müssen nur die API Zugangsdaten eingegeben werden.",
         "labelClientId": "Client-ID",
         "labelClientSecret": "Client-Secret",
@@ -15,6 +16,7 @@
         "messageFetchedError": " Bitte versuche es erneut oder nutze die erweiterten Einstellungen um die Zugangsdaten direkt einzugeben.",
         "textFetchedSuccessful": "Die Zugangsdaten wurden erfolgreich abgerufen.",
         "messageNoCredentials": "Es wurden keine Zugangsdaten hinterlegt.",
+        "messageInvalidCredentials": "Die Zugangsdaten sind ungültig.",
         "messageTestSuccess": "Die Zugangsdaten sind gültig."
     }
 }
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/en-GB.json b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/en-GB.json
index dc3f91c36..8c0697dc2 100644
--- a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/en-GB.json
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/snippets/en-GB.json
@@ -1,6 +1,7 @@
 {
     "swag-paypal-frw-credentials": {
         "buttonGetCredentials": "Get API credentials",
+        "buttonGetSandboxCredentials": "Get sandbox API credentials",
         "textIntroPayPal": "To get PayPal up and running you only need to provide your PayPal API credentials.",
         "labelClientId": "Client ID",
         "labelClientSecret": "Client secret",
@@ -15,6 +16,7 @@
         "messageFetchedError": "Try again or use the advanced settings to provide your credentials.",
         "textFetchedSuccessful": "Credentials have been fetched.",
         "messageNoCredentials": "No credentials provided.",
+        "messageInvalidCredentials": "Credentials are invalid.",
         "messageTestSuccess": "Credentials are valid."
     }
 }
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/index.ts b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/index.ts
new file mode 100644
index 000000000..c15319caa
--- /dev/null
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/index.ts
@@ -0,0 +1,169 @@
+import type * as PayPal from 'src/types';
+import template from './sw-first-run-wizard-paypal-credentials.html.twig';
+import './sw-first-run-wizard-paypal-credentials.scss';
+
+export default Shopware.Component.wrapComponentConfig({
+    template,
+
+    inject: [
+        'systemConfigApiService',
+        'SwagPaypalPaymentMethodService',
+    ],
+
+    mixins: [
+        Shopware.Mixin.getByName('swag-paypal-notification'),
+        Shopware.Mixin.getByName('swag-paypal-credentials-loader'),
+    ],
+
+    data() {
+        return {
+            config: {} as PayPal.SystemConfig,
+            isLoading: false,
+            setDefault: false,
+        };
+    },
+
+    computed: {
+        sandboxMode() {
+            return this.config['SwagPayPal.settings.sandbox'] || false;
+        },
+
+        onboardingUrl() {
+            return this.sandboxMode ? this.onboardingUrlSandbox : this.onboardingUrlLive;
+        },
+
+        onboardingCallback() {
+            return this.sandboxMode ? 'onboardingCallbackSandbox' : 'onboardingCallbackLive';
+        },
+
+        buttonConfig() {
+            const prev = this.$super('buttonConfig') as { key: string; action: () => Promise<boolean> }[];
+
+            return prev.map((button) => {
+                if (button.key === 'next') {
+                    button.action = this.onClickNext.bind(this);
+                }
+
+                return button;
+            });
+        },
+
+        credentialsProvided() {
+            return (!this.sandboxMode && this.credentialsProvidedLive)
+                || (this.sandboxMode && this.credentialsProvidedSandbox);
+        },
+
+        credentialsProvidedLive() {
+            return !!this.config['SwagPayPal.settings.clientId']
+                && !!this.config['SwagPayPal.settings.clientSecret'];
+        },
+
+        credentialsProvidedSandbox() {
+            return !!this.config['SwagPayPal.settings.clientIdSandbox']
+                && !!this.config['SwagPayPal.settings.clientSecretSandbox'];
+        },
+    },
+
+    created() {
+        this.createdComponent();
+    },
+
+    methods: {
+        createdComponent() {
+            this.$super('createdComponent');
+            this.fetchPayPalConfig();
+        },
+
+        onPayPalCredentialsLoadSuccess(clientId: string, clientSecret: string, merchantPayerId: string, sandbox: boolean) {
+            this.setConfig(clientId, clientSecret, merchantPayerId, sandbox);
+        },
+
+        onPayPalCredentialsLoadFailed(sandbox: boolean) {
+            this.setConfig('', '', '', sandbox);
+            this.createNotificationError({
+                message: this.$tc('swag-paypal-frw-credentials.messageFetchedError'),
+                // @ts-expect-error - duration is not defined correctly
+                duration: 10000,
+            });
+        },
+
+        setConfig(clientId: string, clientSecret: string, merchantPayerId: string, sandbox: boolean) {
+            const suffix = sandbox ? 'Sandbox' : '';
+            this.$set(this.config, `SwagPayPal.settings.clientId${suffix}`, clientId);
+            this.$set(this.config, `SwagPayPal.settings.clientSecret${suffix}`, clientSecret);
+            this.$set(this.config, `SwagPayPal.settings.merchantPayerId${suffix}`, merchantPayerId);
+        },
+
+        async onClickNext(): Promise<boolean> {
+            if (!this.credentialsProvided) {
+                this.createNotificationError({
+                    message: this.$tc('swag-paypal-frw-credentials.messageNoCredentials'),
+                });
+
+                return true;
+            }
+
+            try {
+                // Do not test the credentials if they have been fetched from the PayPal api
+                if (!this.isGetCredentialsSuccessful) {
+                    await this.testApiCredentials();
+                }
+
+                await this.saveConfig();
+
+                this.$emit('frw-redirect', 'sw.first.run.wizard.index.plugins');
+
+                return false;
+            } catch {
+                return true;
+            }
+        },
+
+        fetchPayPalConfig() {
+            this.isLoading = true;
+            return this.systemConfigApiService.getValues('SwagPayPal.settings', null)
+                .then((values: PayPal.SystemConfig) => {
+                    this.config = values;
+                })
+                .finally(() => {
+                    this.isLoading = false;
+                });
+        },
+
+        async saveConfig() {
+            this.isLoading = true;
+            await this.systemConfigApiService.saveValues(this.config, null);
+
+            if (this.setDefault) {
+                await this.SwagPaypalPaymentMethodService.setDefaultPaymentForSalesChannel();
+            }
+
+            this.isLoading = false;
+        },
+
+        async testApiCredentials() {
+            this.isLoading = true;
+
+            const sandbox = this.config['SwagPayPal.settings.sandbox'] ?? false;
+            const sandboxSetting = sandbox ? 'Sandbox' : '';
+            const clientId = this.config[`SwagPayPal.settings.clientId${sandboxSetting}`];
+            const clientSecret = this.config[`SwagPayPal.settings.clientSecret${sandboxSetting}`];
+
+            const response = await this.SwagPayPalApiCredentialsService
+                .validateApiCredentials(clientId, clientSecret, sandbox)
+                .catch((errorResponse: PayPal.ServiceError) => {
+                    this.createNotificationFromError({ errorResponse, title: 'swag-paypal.settingForm.messageTestError' });
+
+                    return { credentialsValid: false };
+                });
+
+            this.isLoading = false;
+
+            return response.credentialsValid ? Promise.resolve() : Promise.reject();
+        },
+
+        onCredentialsChanged() {
+            this.isGetCredentialsSuccessful = null;
+        },
+    },
+});
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/sw-first-run-wizard-paypal-credentials.html.twig b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/sw-first-run-wizard-paypal-credentials.html.twig
new file mode 100644
index 000000000..2edd26d36
--- /dev/null
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/sw-first-run-wizard-paypal-credentials.html.twig
@@ -0,0 +1,122 @@
+{% block sw_first_run_wizard_paypal_credentials %}
+<div class="sw-first-run-wizard-paypal-credentials">
+
+    {% block sw_first_run_wizard_paypal_credentials_inner %}
+        <sw-loader v-if="isLoading" />
+
+        {% block sw_first_run_wizard_paypal_credentials_intro %}
+        <p class="sw-first-run-wizard-paypal-credentials__headerText">
+            {{ $tc('swag-paypal-frw-credentials.textIntroPayPal') }}
+        </p>
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_sandbox %}
+        <sw-switch-field
+            v-model:value="config['SwagPayPal.settings.sandbox']"
+            :label="$tc('swag-paypal-frw-credentials.labelSandbox')"
+            :helpText="$tc('swag-paypal-frw-credentials.tooltipSandbox')"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_button_container %}
+        <div class="sw-first-run-wizard-paypal-credentials__button-container">
+
+            {% block sw_first_run_wizard_paypal_credentials_button %}
+            <a
+                class="sw-button sw-button--primary swag-paypal-frw__signup-button"
+                target="_blank"
+                :data-paypal-onboard-complete="onboardingCallback"
+                :href="`${onboardingUrl}`"
+                data-paypal-button="true"
+            >
+                {{ $tc('swag-paypal-frw-credentials.buttonGetCredentials') }}
+            </a>
+            {% endblock %}
+
+            {% block sw_first_run_wizard_paypal_credentials_indicator %}
+            <div class="sw-first-run-wizard-paypal-credentials__indicator">
+                <template v-if="isGetCredentialsSuccessful">
+
+                    {% block sw_first_run_wizard_paypal_credentials_indicator_icon %}
+                    <sw-icon
+                        name="regular-checkmark-s"
+                        class="sw-first-run-wizard-paypal-credentials__icon-successful"
+                    />
+                    {% endblock %}
+
+                    {% block sw_first_run_wizard_paypal_credentials_indicator_text %}
+                    <span class="sw-first-run-wizard-paypal-credentials__text-indicator">
+                        {{ $tc('swag-paypal-frw-credentials.textFetchedSuccessful') }}
+                    </span>
+                    {% endblock %}
+                </template>
+            </div>
+            {% endblock %}
+        </div>
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_client_id %}
+        <sw-text-field
+            v-show="!sandboxMode"
+            v-model:value="config['SwagPayPal.settings.clientId']"
+            :label="$tc('swag-paypal-frw-credentials.labelClientId')"
+            @update:value="onCredentialsChanged"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_client_secret %}
+        <sw-text-field
+            v-show="!sandboxMode"
+            v-model:value="config['SwagPayPal.settings.clientSecret']"
+            :label="$tc('swag-paypal-frw-credentials.labelClientSecret')"
+            @update:value="onCredentialsChanged"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_merchant_id %}
+        <sw-text-field
+            v-show="!sandboxMode"
+            v-model:value="config['SwagPayPal.settings.merchantPayerId']"
+            :label="$tc('swag-paypal-frw-credentials.labelMerchantPayerId')"
+            @update:value="onCredentialsChanged"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_client_id_sandbox %}
+        <sw-text-field
+            v-show="sandboxMode"
+            v-model:value="config['SwagPayPal.settings.clientIdSandbox']"
+            :label="$tc('swag-paypal-frw-credentials.labelClientIdSandbox')"
+            @update:value="onCredentialsChanged"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_client_secret_sandbox %}
+        <sw-text-field
+            v-show="sandboxMode"
+            v-model:value="config['SwagPayPal.settings.clientSecretSandbox']"
+            :label="$tc('swag-paypal-frw-credentials.labelClientSecretSandbox')"
+            @update:value="onCredentialsChanged"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_merchant_id_sandbox %}
+        <sw-text-field
+            v-show="sandboxMode"
+            v-model:value="config['SwagPayPal.settings.merchantPayerIdSandbox']"
+            :label="$tc('swag-paypal-frw-credentials.labelMerchantPayerIdSandbox')"
+            @update:value="onCredentialsChanged"
+        />
+        {% endblock %}
+
+        {% block sw_first_run_wizard_paypal_credentials_set_default %}
+        <sw-switch-field
+            v-model:value="setDefault"
+            :disabled="!credentialsProvided"
+            :label="$tc('swag-paypal-frw-credentials.labelSetDefault')"
+            :helpText="$tc('swag-paypal-frw-credentials.tooltipSetDefault')"
+        />
+        {% endblock %}
+    {% endblock %}
+</div>
+{% endblock %}
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/sw-first-run-wizard-paypal-credentials.scss b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/sw-first-run-wizard-paypal-credentials.scss
new file mode 100644
index 000000000..194384243
--- /dev/null
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials-deprecated/sw-first-run-wizard-paypal-credentials.scss
@@ -0,0 +1,31 @@
+@import "~scss/variables";
+
+.sw-first-run-wizard-paypal-credentials {
+    width: 100%;
+
+    .sw-first-run-wizard-paypal-credentials__headerText {
+        font-weight: bold;
+        color: $color-darkgray-200;
+        margin-bottom: 22px;
+    }
+
+    .sw-first-run-wizard-paypal-credentials__button-container {
+        display: flex;
+        align-items: center;
+        margin-bottom: 22px;
+
+        .sw-first-run-wizard-paypal-credentials__indicator {
+            display: inline;
+            margin-left: 25px;
+
+            .sw-first-run-wizard-paypal-credentials__icon-successful {
+                color: $color-emerald-500;
+                margin-top: -5px;
+            }
+
+            .sw-first-run-wizard-paypal-credentials__text-indicator {
+                margin-left: 8px;
+            }
+        }
+    }
+}
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/index.ts b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/index.ts
index c15319caa..23a5b49db 100644
--- a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/index.ts
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/index.ts
@@ -1,4 +1,3 @@
-import type * as PayPal from 'src/types';
 import template from './sw-first-run-wizard-paypal-credentials.html.twig';
 import './sw-first-run-wizard-paypal-credentials.scss';
 
@@ -6,36 +5,28 @@ export default Shopware.Component.wrapComponentConfig({
     template,
 
     inject: [
-        'systemConfigApiService',
         'SwagPaypalPaymentMethodService',
+        'SwagPayPalSettingsService',
     ],
 
     mixins: [
         Shopware.Mixin.getByName('swag-paypal-notification'),
-        Shopware.Mixin.getByName('swag-paypal-credentials-loader'),
+        Shopware.Mixin.getByName('swag-paypal-settings'),
     ],
 
-    data() {
+    data(): {
+        isLoading: boolean;
+        asDefault: boolean;
+        error: { detail: string; code: string } | null;
+    } {
         return {
-            config: {} as PayPal.SystemConfig,
             isLoading: false,
-            setDefault: false,
+            asDefault: false,
+            error: null,
         };
     },
 
     computed: {
-        sandboxMode() {
-            return this.config['SwagPayPal.settings.sandbox'] || false;
-        },
-
-        onboardingUrl() {
-            return this.sandboxMode ? this.onboardingUrlSandbox : this.onboardingUrlLive;
-        },
-
-        onboardingCallback() {
-            return this.sandboxMode ? 'onboardingCallbackSandbox' : 'onboardingCallbackLive';
-        },
-
         buttonConfig() {
             const prev = this.$super('buttonConfig') as { key: string; action: () => Promise<boolean> }[];
 
@@ -48,54 +39,38 @@ export default Shopware.Component.wrapComponentConfig({
             });
         },
 
-        credentialsProvided() {
-            return (!this.sandboxMode && this.credentialsProvidedLive)
-                || (this.sandboxMode && this.credentialsProvidedSandbox);
-        },
-
-        credentialsProvidedLive() {
-            return !!this.config['SwagPayPal.settings.clientId']
-                && !!this.config['SwagPayPal.settings.clientSecret'];
-        },
-
-        credentialsProvidedSandbox() {
-            return !!this.config['SwagPayPal.settings.clientIdSandbox']
-                && !!this.config['SwagPayPal.settings.clientSecretSandbox'];
+        hasLiveCredentials() {
+            return !!this.settingsStore.get('SwagPayPal.settings.clientId')
+                && !!this.settingsStore.get('SwagPayPal.settings.clientSecret');
         },
-    },
-
-    created() {
-        this.createdComponent();
-    },
 
-    methods: {
-        createdComponent() {
-            this.$super('createdComponent');
-            this.fetchPayPalConfig();
+        hasSandboxCredentials() {
+            return !!this.settingsStore.get('SwagPayPal.settings.clientIdSandbox')
+                && !!this.settingsStore.get('SwagPayPal.settings.clientSecretSandbox');
         },
 
-        onPayPalCredentialsLoadSuccess(clientId: string, clientSecret: string, merchantPayerId: string, sandbox: boolean) {
-            this.setConfig(clientId, clientSecret, merchantPayerId, sandbox);
+        hasCredentials() {
+            return (!this.settingsStore.isSandbox && this.hasLiveCredentials)
+                || (this.settingsStore.isSandbox && this.hasSandboxCredentials);
         },
 
-        onPayPalCredentialsLoadFailed(sandbox: boolean) {
-            this.setConfig('', '', '', sandbox);
-            this.createNotificationError({
-                message: this.$tc('swag-paypal-frw-credentials.messageFetchedError'),
-                // @ts-expect-error - duration is not defined correctly
-                duration: 10000,
-            });
+        inputsDisabled() {
+            return this.isLoading || this.settingsStore.isLoading || this.savingSettings === 'loading';
         },
+    },
 
-        setConfig(clientId: string, clientSecret: string, merchantPayerId: string, sandbox: boolean) {
-            const suffix = sandbox ? 'Sandbox' : '';
-            this.$set(this.config, `SwagPayPal.settings.clientId${suffix}`, clientId);
-            this.$set(this.config, `SwagPayPal.settings.clientSecret${suffix}`, clientSecret);
-            this.$set(this.config, `SwagPayPal.settings.merchantPayerId${suffix}`, merchantPayerId);
+    watch: {
+        'settingsStore.allConfigs': {
+            deep: true,
+            handler() {
+                this.resetError();
+            },
         },
+    },
 
+    methods: {
         async onClickNext(): Promise<boolean> {
-            if (!this.credentialsProvided) {
+            if (!this.hasCredentials) {
                 this.createNotificationError({
                     message: this.$tc('swag-paypal-frw-credentials.messageNoCredentials'),
                 });
@@ -103,67 +78,57 @@ export default Shopware.Component.wrapComponentConfig({
                 return true;
             }
 
-            try {
-                // Do not test the credentials if they have been fetched from the PayPal api
-                if (!this.isGetCredentialsSuccessful) {
-                    await this.testApiCredentials();
-                }
-
-                await this.saveConfig();
-
-                this.$emit('frw-redirect', 'sw.first.run.wizard.index.plugins');
-
-                return false;
-            } catch {
-                return true;
-            }
-        },
-
-        fetchPayPalConfig() {
             this.isLoading = true;
-            return this.systemConfigApiService.getValues('SwagPayPal.settings', null)
-                .then((values: PayPal.SystemConfig) => {
-                    this.config = values;
-                })
-                .finally(() => {
-                    this.isLoading = false;
-                });
-        },
 
-        async saveConfig() {
-            this.isLoading = true;
-            await this.systemConfigApiService.saveValues(this.config, null);
+            const information = (await this.saveSettings())?.null;
+
+            const haveChanged = (!this.settingsStore.isSandbox && information?.liveCredentialsChanged) || (this.settingsStore.isSandbox && information?.sandboxCredentialsChanged);
+            let areValid = (!this.settingsStore.isSandbox && information?.liveCredentialsValid) || (this.settingsStore.isSandbox && information?.sandboxCredentialsValid);
 
-            if (this.setDefault) {
-                await this.SwagPaypalPaymentMethodService.setDefaultPaymentForSalesChannel();
+            if (!haveChanged) {
+                areValid = await this.onTest();
             }
 
             this.isLoading = false;
-        },
 
-        async testApiCredentials() {
-            this.isLoading = true;
+            if (!areValid) {
+                this.error = {
+                    detail: this.$tc('swag-paypal-frw-credentials.messageInvalidCredentials'),
+                    code: 'ASD',
+                };
 
-            const sandbox = this.config['SwagPayPal.settings.sandbox'] ?? false;
-            const sandboxSetting = sandbox ? 'Sandbox' : '';
-            const clientId = this.config[`SwagPayPal.settings.clientId${sandboxSetting}`];
-            const clientSecret = this.config[`SwagPayPal.settings.clientSecret${sandboxSetting}`];
+                return true;
+            }
 
-            const response = await this.SwagPayPalApiCredentialsService
-                .validateApiCredentials(clientId, clientSecret, sandbox)
-                .catch((errorResponse: PayPal.ServiceError) => {
-                    this.createNotificationFromError({ errorResponse, title: 'swag-paypal.settingForm.messageTestError' });
+            this.$emit('frw-redirect', 'sw.first.run.wizard.index.plugins');
 
-                    return { credentialsValid: false };
-                });
+            if (this.asDefault) {
+                try {
+                    await this.SwagPaypalPaymentMethodService.setDefaultPaymentForSalesChannel(this.settingsStore.salesChannel);
+                } catch {
+                    return true;
+                }
+            }
 
-            this.isLoading = false;
+            return false;
+        },
 
-            return response.credentialsValid ? Promise.resolve() : Promise.reject();
+        resetError() {
+            this.error = null;
         },
 
-        onCredentialsChanged() {
-            this.isGetCredentialsSuccessful = null;
+        async onTest() {
+            const suffix = this.settingsStore.isSandbox ? 'Sandbox' : '';
+
+            return this.SwagPayPalSettingsService
+                .testApiCredentials(
+                    this.settingsStore.get(`SwagPayPal.settings.clientId${suffix}`),
+                    this.settingsStore.get(`SwagPayPal.settings.clientSecret${suffix}`),
+                    this.settingsStore.get(`SwagPayPal.settings.merchantPayerId${suffix}`),
+                    this.settingsStore.isSandbox,
+                )
+                .then((response) => response.valid)
+                .catch(() => false);
         },
     },
 });
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.html.twig b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.html.twig
index 2edd26d36..d35588e17 100644
--- a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.html.twig
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.html.twig
@@ -1,122 +1,85 @@
 {% block sw_first_run_wizard_paypal_credentials %}
 <div class="sw-first-run-wizard-paypal-credentials">
+    <p class="sw-first-run-wizard-paypal-credentials__headerText">
+        {{ $tc('swag-paypal-frw-credentials.textIntroPayPal') }}
+    </p>
 
-    {% block sw_first_run_wizard_paypal_credentials_inner %}
-        <sw-loader v-if="isLoading" />
-
-        {% block sw_first_run_wizard_paypal_credentials_intro %}
-        <p class="sw-first-run-wizard-paypal-credentials__headerText">
-            {{ $tc('swag-paypal-frw-credentials.textIntroPayPal') }}
-        </p>
-        {% endblock %}
+    <template v-if="settingsStore.isLoading">
+        <sw-skeleton-bar />
+        <sw-skeleton-bar />
+        <sw-skeleton-bar />
+    </template>
 
-        {% block sw_first_run_wizard_paypal_credentials_sandbox %}
-        <sw-switch-field
-            v-model:value="config['SwagPayPal.settings.sandbox']"
-            :label="$tc('swag-paypal-frw-credentials.labelSandbox')"
-            :helpText="$tc('swag-paypal-frw-credentials.tooltipSandbox')"
+    <template v-else>
+        <swag-paypal-setting
+            path="SwagPayPal.settings.sandbox"
+            :bordered="false"
+            :disabled="inputsDisabled"
+            @update:value="resetError()"
         />
-        {% endblock %}
-
-        {% block sw_first_run_wizard_paypal_credentials_button_container %}
-        <div class="sw-first-run-wizard-paypal-credentials__button-container">
-
-            {% block sw_first_run_wizard_paypal_credentials_button %}
-            <a
-                class="sw-button sw-button--primary swag-paypal-frw__signup-button"
-                target="_blank"
-                :data-paypal-onboard-complete="onboardingCallback"
-                :href="`${onboardingUrl}`"
-                data-paypal-button="true"
-            >
-                {{ $tc('swag-paypal-frw-credentials.buttonGetCredentials') }}
-            </a>
-            {% endblock %}
-
-            {% block sw_first_run_wizard_paypal_credentials_indicator %}
-            <div class="sw-first-run-wizard-paypal-credentials__indicator">
-                <template v-if="isGetCredentialsSuccessful">
 
-                    {% block sw_first_run_wizard_paypal_credentials_indicator_icon %}
-                    <sw-icon
-                        name="regular-checkmark-s"
-                        class="sw-first-run-wizard-paypal-credentials__icon-successful"
-                    />
-                    {% endblock %}
+        <swag-paypal-onboarding-button
+            v-show="!settingsStore.isSandbox"
+            type="live"
+            :disabled="inputsDisabled"
+        >
+            {{ $tc('swag-paypal-frw-credentials.buttonGetCredentials') }}
+        </swag-paypal-onboarding-button>
 
-                    {% block sw_first_run_wizard_paypal_credentials_indicator_text %}
-                    <span class="sw-first-run-wizard-paypal-credentials__text-indicator">
-                        {{ $tc('swag-paypal-frw-credentials.textFetchedSuccessful') }}
-                    </span>
-                    {% endblock %}
-                </template>
-            </div>
-            {% endblock %}
-        </div>
-        {% endblock %}
+        <swag-paypal-onboarding-button
+            v-show="settingsStore.isSandbox"
+            type="sandbox"
+            :disabled="inputsDisabled"
+        >
+            {{ $tc('swag-paypal-frw-credentials.buttonGetSandboxCredentials') }}
+        </swag-paypal-onboarding-button>
 
-        {% block sw_first_run_wizard_paypal_credentials_client_id %}
-        <sw-text-field
-            v-show="!sandboxMode"
-            v-model:value="config['SwagPayPal.settings.clientId']"
-            :label="$tc('swag-paypal-frw-credentials.labelClientId')"
-            @update:value="onCredentialsChanged"
+        <swag-paypal-setting
+            v-show="!settingsStore.isSandbox"
+            path="SwagPayPal.settings.clientId"
+            :disabled="inputsDisabled"
+            :error="error"
         />
-        {% endblock %}
-
-        {% block sw_first_run_wizard_paypal_credentials_client_secret %}
-        <sw-text-field
-            v-show="!sandboxMode"
-            v-model:value="config['SwagPayPal.settings.clientSecret']"
-            :label="$tc('swag-paypal-frw-credentials.labelClientSecret')"
-            @update:value="onCredentialsChanged"
+        <swag-paypal-setting
+            v-show="!settingsStore.isSandbox"
+            path="SwagPayPal.settings.clientSecret"
+            :disabled="inputsDisabled"
+            :error="error"
         />
-        {% endblock %}
-
-        {% block sw_first_run_wizard_paypal_credentials_merchant_id %}
-        <sw-text-field
-            v-show="!sandboxMode"
-            v-model:value="config['SwagPayPal.settings.merchantPayerId']"
-            :label="$tc('swag-paypal-frw-credentials.labelMerchantPayerId')"
-            @update:value="onCredentialsChanged"
+        <swag-paypal-setting
+            v-show="!settingsStore.isSandbox"
+            path="SwagPayPal.settings.merchantPayerId"
+            :disabled="inputsDisabled"
+            :error="error"
         />
-        {% endblock %}
 
-        {% block sw_first_run_wizard_paypal_credentials_client_id_sandbox %}
-        <sw-text-field
-            v-show="sandboxMode"
-            v-model:value="config['SwagPayPal.settings.clientIdSandbox']"
-            :label="$tc('swag-paypal-frw-credentials.labelClientIdSandbox')"
-            @update:value="onCredentialsChanged"
+        <swag-paypal-setting
+            v-show="settingsStore.isSandbox"
+            path="SwagPayPal.settings.clientIdSandbox"
+            :disabled="inputsDisabled"
+            :error="error"
         />
-        {% endblock %}
-
-        {% block sw_first_run_wizard_paypal_credentials_client_secret_sandbox %}
-        <sw-text-field
-            v-show="sandboxMode"
-            v-model:value="config['SwagPayPal.settings.clientSecretSandbox']"
-            :label="$tc('swag-paypal-frw-credentials.labelClientSecretSandbox')"
-            @update:value="onCredentialsChanged"
+        <swag-paypal-setting
+            v-show="settingsStore.isSandbox"
+            path="SwagPayPal.settings.clientSecretSandbox"
+            :disabled="inputsDisabled"
+            :error="error"
         />
-        {% endblock %}
-
-        {% block sw_first_run_wizard_paypal_credentials_merchant_id_sandbox %}
-        <sw-text-field
-            v-show="sandboxMode"
-            v-model:value="config['SwagPayPal.settings.merchantPayerIdSandbox']"
-            :label="$tc('swag-paypal-frw-credentials.labelMerchantPayerIdSandbox')"
-            @update:value="onCredentialsChanged"
+        <swag-paypal-setting
+            v-show="settingsStore.isSandbox"
+            path="SwagPayPal.settings.merchantPayerIdSandbox"
+            :disabled="inputsDisabled"
+            :error="error"
         />
-        {% endblock %}
 
-        {% block sw_first_run_wizard_paypal_credentials_set_default %}
         <sw-switch-field
-            v-model:value="setDefault"
-            :disabled="!credentialsProvided"
+            v-model:value="asDefault"
+            :disabled="!hasCredentials || inputsDisabled"
             :label="$tc('swag-paypal-frw-credentials.labelSetDefault')"
             :helpText="$tc('swag-paypal-frw-credentials.tooltipSetDefault')"
         />
-        {% endblock %}
-    {% endblock %}
+
+        <sw-loader v-if="isLoading" />
+    </template>
 </div>
 {% endblock %}
diff --git a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.scss b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.scss
index 194384243..2f3fe6ca1 100644
--- a/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.scss
+++ b/src/Resources/app/administration/src/module/extension/sw-first-run-wizard/sw-first-run-wizard-paypal-credentials/sw-first-run-wizard-paypal-credentials.scss
@@ -3,29 +3,29 @@
 .sw-first-run-wizard-paypal-credentials {
     width: 100%;
 
-    .sw-first-run-wizard-paypal-credentials__headerText {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+
+    &__headerText {
         font-weight: bold;
         color: $color-darkgray-200;
-        margin-bottom: 22px;
     }
 
-    .sw-first-run-wizard-paypal-credentials__button-container {
-        display: flex;
-        align-items: center;
-        margin-bottom: 22px;
+    &__as_default {
+        margin: 0;
+    }
 
-        .sw-first-run-wizard-paypal-credentials__indicator {
-            display: inline;
-            margin-left: 25px;
+    .sw-field.sw-block-field, .sw-field--switch {
+        margin: 0;
+    }
 
-            .sw-first-run-wizard-paypal-credentials__icon-successful {
-                color: $color-emerald-500;
-                margin-top: -5px;
-            }
+    .sw-field--switch .sw-field__label label {
+        padding-top: 0;
+        padding-bottom: 0;
+    }
 
-            .sw-first-run-wizard-paypal-credentials__text-indicator {
-                margin-left: 8px;
-            }
-        }
+    .swag-paypal-onboarding-button {
+        align-self: start;
     }
 }