diff --git a/changelog.md b/changelog.md
index 4dc83f73a..3fe31cd34 100755
--- a/changelog.md
+++ b/changelog.md
@@ -196,4 +196,7 @@
 ## [2.0.2]
 - Remove WL Crypto payment method
 - Added setting to toggle order confirmation email sending
-- Added feature to group card payment methods into unified "Card" payment method
\ No newline at end of file
+- Added feature to group card payment methods into unified "Card" payment method
+- Fixed issue when newly enabled payment methods did not appear in checkout because default "all countries/currencies" restriction was not created on save
+- Fixed issue when payment method country/currency dropdowns showed "0" instead of indicating that all countries/currencies are allowed
+- BO : Added validation for Merchant Emails field (frontend + backend) to prevent saving invalid addresses
diff --git a/controllers/admin/AdminSaferPayOfficialFieldsController.php b/controllers/admin/AdminSaferPayOfficialFieldsController.php
deleted file mode 100755
index 7508d5986..000000000
--- a/controllers/admin/AdminSaferPayOfficialFieldsController.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-
-use Invertus\SaferPay\Config\SaferPayConfig;
-
-require_once dirname(__FILE__) . '/../../vendor/autoload.php';
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-class AdminSaferPayOfficialFieldsController extends ModuleAdminController
-{
-    public function __construct()
-    {
-        parent::__construct();
-        $this->bootstrap = true;
-
-        $this->tpl_folder = 'field-option-settings/';
-        $this->initOptions();
-    }
-
-    public function initContent()
-    {
-        parent::initContent();
-    }
-
-    public function initOptions()
-    {
-        $this->fields_options = [
-            'hosted_fields_settings' => [
-                'title' => $this->module->l('Hosted fields settings'),
-                'icon' => 'icon-settings',
-                'fields' => [
-                    SaferPayConfig::HOSTED_FIELDS_TEMPLATE . '_description' => [
-                        'type' => 'desc',
-                        'class' => 'col-lg-12',
-                        'template' => 'field-hosted-field-template-desc.tpl',
-                    ],
-
-                    SaferPayConfig::HOSTED_FIELDS_TEMPLATE => [
-                        'type' => 'select-template',
-                        'name' => SaferPayConfig::HOSTED_FIELDS_TEMPLATE,
-                        'templateOptions' => [
-                            "{$this->module->getPathUri()}views/img/hosted-templates/template1.jpg",
-                            "{$this->module->getPathUri()}views/img/hosted-templates/template2.jpg",
-                            "{$this->module->getPathUri()}views/img/hosted-templates/template3.jpg",
-                        ],
-                    ],
-                ],
-                'buttons' => [
-                    'save_and_connect' => [
-                        'title' => $this->module->l('Save'),
-                        'icon' => 'process-icon-save',
-                        'class' => 'btn btn-default pull-right',
-                        'type' => 'submit',
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    public function setMedia($isNewTheme = false)
-    {
-        parent::setMedia($isNewTheme);
-
-        $this->addJS('modules/' . $this->module->name . '/views/js/admin/saferpay_fields.js');
-        $this->addCSS('modules/' . $this->module->name . '/views/css/admin/saferpay_fields.css');
-    }
-}
diff --git a/controllers/admin/AdminSaferPayOfficialSettingsController.php b/controllers/admin/AdminSaferPayOfficialSettingsController.php
index bf6d10fe3..0d4f5ffcf 100755
--- a/controllers/admin/AdminSaferPayOfficialSettingsController.php
+++ b/controllers/admin/AdminSaferPayOfficialSettingsController.php
@@ -40,6 +40,7 @@
 use Invertus\SaferPay\Service\SaferPayRestrictionCreator;
 use Invertus\SaferPay\Exception\Api\SaferPayApiException;
 use Invertus\SaferPay\Exception\Restriction\RestrictionException;
+use Invertus\SaferPay\Logger\LoggerInterface;
 
 require_once dirname(__FILE__) . '/../../vendor/autoload.php';
 
@@ -178,6 +179,17 @@ public function ajaxProcessSaveCredentials()
             }
         }
 
+        $testMerchantEmails = $this->getStringValue($data, 'testMerchantEmails');
+        $liveMerchantEmails = $this->getStringValue($data, 'liveMerchantEmails');
+        $invalidEmail = $this->findInvalidEmail($testMerchantEmails) ?: $this->findInvalidEmail($liveMerchantEmails);
+        if ($invalidEmail !== null) {
+            $this->ajaxResponse(false, sprintf(
+                $this->module->l('Invalid merchant email address: %s', self::FILE_NAME),
+                $invalidEmail
+            ));
+            return;
+        }
+
         // Credentials validated — now save
         $configuration->set(SaferPayConfig::TEST_MODE, $isTestMode ? 1 : 0);
 
@@ -209,8 +221,8 @@ public function ajaxProcessSaveCredentials()
 
         // Auto-detect license features from Saferpay Management API
         $suffix = $isTestMode ? SaferPayConfig::TEST_SUFFIX : '';
-        $licenseMessage = '';
         $hasBusinessLicense = false;
+        $licenseFetchFailed = false;
 
         if (!empty($activeUsername) && !empty($activePassword) && !empty($activeCustomerId)) {
             try {
@@ -227,18 +239,29 @@ public function ajaxProcessSaveCredentials()
                 $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, $hasBusinessLicense ? 1 : 0);
             } catch (\Exception $e) {
                 $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, 0);
+                $licenseFetchFailed = true;
 
-                $licenseMessage = ' ' . $this->module->l('Could not retrieve license information. Please verify your credentials.', self::FILE_NAME);
+                /** @var LoggerInterface $logger */
+                $logger = $this->module->getService(LoggerInterface::class);
+                $logger->error('License fetch failed on credentials save: ' . $e->getMessage(), [
+                    'context' => ['exception_class' => get_class($e)],
+                ]);
             }
         } else {
             $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, 0);
         }
 
+        $message = $licenseFetchFailed
+            ? $this->module->l('Settings saved, but Saferpay Fields availability could not be confirmed. Please try again later or check the module Logs for details.', self::FILE_NAME)
+            : $this->module->l('Settings saved successfully.', self::FILE_NAME);
+
         $this->ajaxResponse(
             true,
-            $this->module->l('Settings saved successfully.', self::FILE_NAME) . $licenseMessage,
+            $message,
             [
-                'hasBusinessLicense' => $hasBusinessLicense,
+                'testHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::TEST_SUFFIX),
+                'liveHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE),
+                'warning' => $licenseFetchFailed,
             ]
         );
     }
@@ -312,7 +335,19 @@ public function ajaxProcessSaveGeneralSettings()
 
         $configuration->set(SaferPayConfig::SAFERPAY_ORDER_STATE_CHOICE_AWAITING_PAYMENT, $this->getIntValue($data, 'orderStateAwaitingPayment'));
         $configuration->set(SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION, $this->getStringValue($data, 'paymentDescription'));
-        $configuration->set(SaferPayConfig::CONFIGURATION_NAME, $this->getStringValue($data, 'configurationName'));
+
+        $configurationName = $this->getStringValue($data, 'configurationName');
+        if ($configurationName !== '' && (strlen($configurationName) > 20 || !preg_match('/^[A-Za-z0-9.:\-_]+$/', $configurationName))) {
+            $this->ajaxResponse(false, $this->module->l('Only letters, numbers, dots, colons, hyphens, and underscores are allowed. Max 20 characters.', self::FILE_NAME));
+            return;
+        }
+        $configuration->set(SaferPayConfig::CONFIGURATION_NAME, $configurationName);
+        $hostedFieldsTemplate = $this->getIntValue($data, 'hostedFieldsTemplate');
+        if ($hostedFieldsTemplate < 1 || $hostedFieldsTemplate > 3) {
+            $hostedFieldsTemplate = SaferPayConfig::HOSTED_FIELDS_TEMPLATE_DEFAULT;
+        }
+        $configuration->set(SaferPayConfig::HOSTED_FIELDS_TEMPLATE, $hostedFieldsTemplate);
+        $configuration->set(SaferPayConfig::SAFERPAY_ORDER_ID_OPTION, $this->getIntValue($data, 'orderIdOption'));
         $configuration->set(SaferPayConfig::SAFERPAY_DEBUG_MODE, !empty($data['debugMode']) ? 1 : 0);
 
         $this->ajaxResponse(true, $this->module->l('General settings saved successfully', self::FILE_NAME));
@@ -366,6 +401,13 @@ public function ajaxProcessSavePaymentMethods()
                 $countries = isset($method['countries']) ? $method['countries'] : [];
                 $currencies = isset($method['currencies']) ? $method['currencies'] : [];
 
+                if (empty($countries)) {
+                    $countries = [SaferPayRestrictionCreator::RESTRICTION_ALL];
+                }
+                if (empty($currencies)) {
+                    $currencies = [SaferPayRestrictionCreator::RESTRICTION_ALL];
+                }
+
                 $success = $restrictionCreator->updateRestriction(
                     $paymentName,
                     SaferPayRestrictionCreator::RESTRICTION_COUNTRY,
@@ -522,8 +564,9 @@ private function collectSettingsData()
             'liveFieldAccessToken' => (string) $configuration->get(SaferPayConfig::FIELDS_ACCESS_TOKEN),
             'liveFieldJsUrl' => (string) $configuration->get(SaferPayConfig::FIELDS_LIBRARY),
 
-            // License (auto-detected)
-            'hasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::getConfigSuffix()),
+            // License (auto-detected, per environment)
+            'testHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::TEST_SUFFIX),
+            'liveHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE),
 
             // Payment Processing
             'paymentBehavior' => (int) $configuration->get(SaferPayConfig::PAYMENT_BEHAVIOR),
@@ -543,6 +586,9 @@ private function collectSettingsData()
             'orderStateAwaitingPayment' => (int) $configuration->get(SaferPayConfig::SAFERPAY_ORDER_STATE_CHOICE_AWAITING_PAYMENT),
             'paymentDescription' => (string) $configuration->get(SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION),
             'configurationName' => (string) $configuration->get(SaferPayConfig::CONFIGURATION_NAME),
+            'hostedFieldsTemplate' => (int) $configuration->get(SaferPayConfig::HOSTED_FIELDS_TEMPLATE),
+            'modulePath' => $this->module->getPathUri(),
+            'orderIdOption' => (int) $configuration->get(SaferPayConfig::SAFERPAY_ORDER_ID_OPTION),
             'debugMode' => (bool) $configuration->get(SaferPayConfig::SAFERPAY_DEBUG_MODE),
 
             // Reference data
@@ -757,4 +803,24 @@ private function getIntValue($data, $key)
     {
         return isset($data[$key]) ? (int) $data[$key] : 0;
     }
+
+    /**
+     * Returns the first invalid email in a comma-separated list, or null if all are valid.
+     */
+    private function findInvalidEmail($emails)
+    {
+        if ($emails === '') {
+            return null;
+        }
+        foreach (explode(',', $emails) as $email) {
+            $email = trim($email);
+            if ($email === '') {
+                continue;
+            }
+            if (!\Validate::isEmail($email)) {
+                return $email;
+            }
+        }
+        return null;
+    }
 }
diff --git a/controllers/front/notify.php b/controllers/front/notify.php
index 870464e7c..667a1fd4d 100755
--- a/controllers/front/notify.php
+++ b/controllers/front/notify.php
@@ -140,27 +140,50 @@ public function postProcess()
             //NOTE must be left below assert action to get newest information.
             $order = new Order($orderId);
 
+            $paymentBehaviorWithout3D = (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D);
+
             if (!$assertResponseBody->getLiability()->getLiabilityShift() &&
-                in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS) &&
-                (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D) === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL
+                in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS)
             ) {
                 /** @var SaferPayOrderStatusService $orderStatusService */
                 $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
-                $orderStatusService->cancel($order);
 
-                $logger->debug(sprintf('%s - Liability shift is false', self::FILE_NAME), [
-                    'context' => [
-                        'id_order' => $order->id,
-                    ],
-                ]);
+                if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL) {
+                    $orderStatusService->cancel($order);
 
-                $logger->debug(sprintf('%s - liability shift is false', self::FILE_NAME), [
-                    'context' => [
-                        'id_order' => $order->id,
-                    ],
-                ]);
+                    $logger->debug(sprintf('%s - Liability shift is false, canceling order', self::FILE_NAME), [
+                        'context' => [
+                            'id_order' => $order->id,
+                        ],
+                    ]);
 
-                die($this->module->l('Liability shift is false', self::FILE_NAME));
+                    die($this->module->l('Liability shift is false', self::FILE_NAME));
+                }
+
+                if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_AUTHORIZE) {
+                    $logger->debug(sprintf('%s - Liability shift is false, order left authorized', self::FILE_NAME), [
+                        'context' => [
+                            'id_order' => $order->id,
+                        ],
+                    ]);
+
+                    die($this->module->l('Liability shift is false, order left authorized', self::FILE_NAME));
+                }
+
+                if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE
+                    && SaferPayConfig::supportsOrderCapture($order->payment)
+                    && $transactionStatus !== TransactionStatus::CAPTURED
+                ) {
+                    $orderStatusService->capture($order);
+
+                    $logger->debug(sprintf('%s - Liability shift is false, capturing order', self::FILE_NAME), [
+                        'context' => [
+                            'id_order' => $order->id,
+                        ],
+                    ]);
+
+                    die($this->module->l('Liability shift is false, capturing order', self::FILE_NAME));
+                }
             }
 
             //NOTE to get latest information possible and not override new information.
diff --git a/controllers/front/return.php b/controllers/front/return.php
index b5fc37c69..a65984b32 100755
--- a/controllers/front/return.php
+++ b/controllers/front/return.php
@@ -274,7 +274,9 @@ private function executeTransaction($orderId, $selectedCard)
      */
     private function getRedirectionToControllerUrl($controllerName)
     {
-        $cartId = $this->context->cart->id ? $this->context->cart->id : Tools::getValue('cartId');
+        $cartId = (int) Tools::getValue('cartId') ?: (int) $this->context->cart->id;
+        $cart = new Cart($cartId);
+        $secureKey = Validate::isLoadedObject($cart) ? $cart->secure_key : $this->context->cart->secure_key;
 
         return $this->context->link->getModuleLink(
             $this->module->name,
@@ -282,7 +284,7 @@ private function getRedirectionToControllerUrl($controllerName)
             [
                 'cartId' => $cartId,
                 'orderId' => Order::getIdByCartId($cartId),
-                'secureKey' => $this->context->cart->secure_key,
+                'secureKey' => $secureKey,
                 'moduleId' => $this->module->id,
             ]
         );
@@ -329,19 +331,39 @@ private function createAndValidateOrder($assertResponseBody, $transactionStatus,
         $orderId = Order::getIdByCartId($cartId);
 
         $order = new Order($orderId);
+        $paymentBehaviorWithout3D = (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D);
+
         if (!$assertResponseBody->getLiability()->getLiabilityShift() &&
-            in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS) &&
-            (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D) === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL
+            in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS)
         ) {
             /** @var SaferPayOrderStatusService $orderStatusService */
             $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
-            $orderStatusService->cancel($order);
+
+            if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL) {
+                $orderStatusService->cancel($order);
+
+                return;
+            }
+
+            if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_AUTHORIZE) {
+                return;
+            }
+
+            if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE
+                && SaferPayConfig::supportsOrderCapture($order->payment)
+                && $transactionStatus !== TransactionStatus::CAPTURED
+            ) {
+                $orderStatusService->capture($order);
+
+                return;
+            }
         }
 
         //NOTE to get latest information possible and not override new information.
 
-        $paymentMethod = $assertResponseBody->getPaymentMeans()->getBrand()->getPaymentMethod();// if payment does not support order capture, it means it always auto-captures it (at least with accountToAccount payment),
+        $paymentMethod = $assertResponseBody->getPaymentMeans()->getBrand()->getPaymentMethod();
 
+        // if payment does not support order capture, it means it always auto-captures it (at least with accountToAccount payment),
         // so in this case if status comes back "captured" we just update the order state accordingly
         if (!SaferPayConfig::supportsOrderCapture($paymentMethod) &&
             $transactionStatus === TransactionStatus::CAPTURED
diff --git a/cypress/integration/01_ps1764.Module.Configure.cy.js b/cypress/integration/01_ps1764.Module.Configure.cy.js
index b7313cb4c..f8988d2b8 100755
--- a/cypress/integration/01_ps1764.Module.Configure.cy.js
+++ b/cypress/integration/01_ps1764.Module.Configure.cy.js
@@ -117,14 +117,6 @@ it('04 Fields and Logs tabs are shown OK', () => {
     cy.get('.pstaggerAddTagInput').type('saferpay')
     cy.get('#module-search-button').click()
     cy.get('.btn-group > .btn-primary-reverse').click()  //clicking the Congifure
-    cy.get('#subtab-AdminSaferPayOfficialFields').click()
-    cy.get('[id="configuration_form"]').should('be.visible')
-    cy.get('.field-container > :nth-child(1) > img').click()
-    cy.get(':nth-child(2) > img').click()
-    cy.get(':nth-child(3) > img').click()
-    cy.get('[class="alert alert-info"]').should('be.visible')
-    cy.get('[name="submitOptionsconfiguration"]').click()
-    cy.get('[class="alert alert-success"]').should('be.visible')
     cy.get('#subtab-AdminSaferPayOfficialLogs').click()
     cy.get('[id="form-saferpay_log"]').should('be.visible')
 })
diff --git a/cypress/integration/01_ps1770.Module.Configure.cy.js b/cypress/integration/01_ps1770.Module.Configure.cy.js
index 9696c496c..1de0a18c6 100755
--- a/cypress/integration/01_ps1770.Module.Configure.cy.js
+++ b/cypress/integration/01_ps1770.Module.Configure.cy.js
@@ -117,14 +117,6 @@ it('04 Fields and Logs tabs are shown OK', () => {
     cy.get('.pstaggerAddTagInput').type('saferpay')
     cy.get('#module-search-button').click()
     cy.get('.btn-group > .btn-primary-reverse').click()  //clicking the Congifure
-    cy.get('#subtab-AdminSaferPayOfficialFields').click()
-    cy.get('[id="configuration_form"]').should('be.visible')
-    cy.get('.field-container > :nth-child(1) > img').click()
-    cy.get(':nth-child(2) > img').click()
-    cy.get(':nth-child(3) > img').click()
-    cy.get('[class="alert alert-info"]').should('be.visible')
-    cy.get('[name="submitOptionsconfiguration"]').click()
-    cy.get('[class="alert alert-success"]').should('be.visible')
     cy.get('#subtab-AdminSaferPayOfficialLogs').click()
     cy.get('[id="form-saferpay_log"]').should('be.visible')
 })
diff --git a/cypress/integration/01_ps1784.Module.Configure.cy.js b/cypress/integration/01_ps1784.Module.Configure.cy.js
index 8da2aae5b..716aa4837 100755
--- a/cypress/integration/01_ps1784.Module.Configure.cy.js
+++ b/cypress/integration/01_ps1784.Module.Configure.cy.js
@@ -117,14 +117,6 @@ it('04 Fields and Logs tabs are shown OK', () => {
     cy.get('.pstaggerAddTagInput').type('saferpay')
     cy.get('#module-search-button').click()
     cy.get('.btn-group > .btn-primary-reverse').click()  //clicking the Congifure
-    cy.get('#subtab-AdminSaferPayOfficialFields').click()
-    cy.get('[id="configuration_form"]').should('be.visible')
-    cy.get('.field-container > :nth-child(1) > img').click()
-    cy.get(':nth-child(2) > img').click()
-    cy.get(':nth-child(3) > img').click()
-    cy.get('[class="alert alert-info"]').should('be.visible')
-    cy.get('[name="submitOptionsconfiguration"]').click()
-    cy.get('[class="alert alert-success"]').should('be.visible')
     cy.get('#subtab-AdminSaferPayOfficialLogs').click()
     cy.get('[id="form-saferpay_log"]').should('be.visible')
 })
diff --git a/cypress/integration/01_ps1786.Module.Configure.cy.js b/cypress/integration/01_ps1786.Module.Configure.cy.js
index 0c8259a9d..863cb240b 100755
--- a/cypress/integration/01_ps1786.Module.Configure.cy.js
+++ b/cypress/integration/01_ps1786.Module.Configure.cy.js
@@ -117,14 +117,6 @@ it('04 Fields and Logs tabs are shown OK', () => {
     cy.get('.pstaggerAddTagInput').type('saferpay')
     cy.get('#module-search-button').click()
     cy.get('.btn-group > .btn-primary-reverse').click()  //clicking the Congifure
-    cy.get('#subtab-AdminSaferPayOfficialFields').click()
-    cy.get('[id="configuration_form"]').should('be.visible')
-    cy.get('.field-container > :nth-child(1) > img').click()
-    cy.get(':nth-child(2) > img').click()
-    cy.get(':nth-child(3) > img').click()
-    cy.get('[class="alert alert-info"]').should('be.visible')
-    cy.get('[name="submitOptionsconfiguration"]').click()
-    cy.get('[class="alert alert-success"]').should('be.visible')
     cy.get('#subtab-AdminSaferPayOfficialLogs').click()
     cy.get('[id="form-saferpay_log"]').should('be.visible')
 })
diff --git a/saferpayofficial.php b/saferpayofficial.php
index b0acd4630..dd997aa5e 100755
--- a/saferpayofficial.php
+++ b/saferpayofficial.php
@@ -55,7 +55,6 @@ class SaferPayOfficial extends PaymentModule
     const ADMIN_SAFERPAY_MODULE_CONTROLLER = 'AdminSaferPayOfficialModule';
     const ADMIN_SETTINGS_CONTROLLER = 'AdminSaferPayOfficialSettings';
     const ADMIN_PAYMENTS_CONTROLLER = 'AdminSaferPayOfficialPayment';
-    const ADMIN_FIELDS_CONTROLLER = 'AdminSaferPayOfficialFields';
     const ADMIN_ORDER_CONTROLLER = 'AdminSaferPayOfficialOrder';
     const ADMIN_LOGS_CONTROLLER = 'AdminSaferPayOfficialLogs';
 
@@ -65,7 +64,7 @@ public function __construct($name = null)
     {
         $this->name = 'saferpayofficial';
         $this->author = 'Invertus';
-        $this->version = '2.0.2';
+        $this->version = '2.1.1';
         $this->module_key = '3d3506c3e184a1fe63b936b82bda1bdf';
         $this->displayName = 'SaferpayOfficial';
         $this->description = 'Saferpay Payment module';
diff --git a/src/Api/ApiRequest.php b/src/Api/ApiRequest.php
index 72ebc144a..5df54cd59 100755
--- a/src/Api/ApiRequest.php
+++ b/src/Api/ApiRequest.php
@@ -114,14 +114,16 @@ public function get($url, $params = [])
 
             return json_decode($response->raw_body);
         } catch (Exception $exception) {
-            $this->logger->error($exception->getMessage(), [
-                'context' => [
-                    'headers' => $this->getHeaders(),
-                ],
-                'request' => $params,
-                'response' => json_decode($response->raw_body),
-                'exceptions' => ExceptionUtility::getExceptions($exception),
-            ]);
+            if ($response === null) {
+                $this->logger->error($exception->getMessage(), [
+                    'context' => [
+                        'headers' => $this->getHeaders(),
+                    ],
+                    'request' => $params,
+                    'response' => null,
+                    'exceptions' => ExceptionUtility::getExceptions($exception),
+                ]);
+            }
 
             throw $exception;
         }
@@ -170,12 +172,14 @@ public function getWithCredentials($url, $username, $password, $baseUrl, $params
 
             return json_decode($response->raw_body);
         } catch (Exception $exception) {
-            $this->logger->error($exception->getMessage(), [
-                'context' => [],
-                'request' => $params,
-                'response' => $response ? json_decode($response->raw_body) : null,
-                'exceptions' => ExceptionUtility::getExceptions($exception),
-            ]);
+            if ($response === null) {
+                $this->logger->error($exception->getMessage(), [
+                    'context' => [],
+                    'request' => $params,
+                    'response' => null,
+                    'exceptions' => ExceptionUtility::getExceptions($exception),
+                ]);
+            }
 
             throw $exception;
         }
@@ -226,12 +230,14 @@ public function postWithCredentials($url, $username, $password, $baseUrl, $param
 
             return json_decode($response->raw_body);
         } catch (Exception $exception) {
-            $this->logger->error($exception->getMessage(), [
-                'context' => [],
-                'request' => $params,
-                'response' => $response ? json_decode($response->raw_body) : null,
-                'exceptions' => ExceptionUtility::getExceptions($exception),
-            ]);
+            if ($response === null) {
+                $this->logger->error($exception->getMessage(), [
+                    'context' => [],
+                    'request' => $params,
+                    'response' => null,
+                    'exceptions' => ExceptionUtility::getExceptions($exception),
+                ]);
+            }
 
             throw $exception;
         }
diff --git a/src/Config/SaferPayConfig.php b/src/Config/SaferPayConfig.php
index ae7879997..793d0b8e1 100755
--- a/src/Config/SaferPayConfig.php
+++ b/src/Config/SaferPayConfig.php
@@ -276,6 +276,9 @@ class SaferPayConfig
 
     const PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL = 0;
     const PAYMENT_BEHAVIOR_WITHOUT_3D_AUTHORIZE = 1;
+    const PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE = 2;
+
+    const SAFERPAY_ORDER_ID_OPTION = 'SAFERPAY_ORDER_ID_OPTION';
 
     const SAFERPAY_CARDFORM_HOLDERNAME_REQUIRENCE = 'MANDATORY';
     const SAFERPAY_DEBUG_MODE = 'SAFERPAY_DEBUG_MODE';
@@ -433,12 +436,13 @@ public static function getDefaultConfiguration()
             RequestHeader::SPEC_REFUND_VERSION => SaferPayConfig::API_VERSION,
             RequestHeader::RETRY_INDICATOR => 0,
             SaferPayConfig::PAYMENT_BEHAVIOR => 1,
-            SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D => 1,
+            SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D => 0,
             SaferPayConfig::SAFERPAY_ALLOW_SAFERPAY_SEND_CUSTOMER_MAIL => 1,
             SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION => self::SAFERPAY_PAYMENT_DESCRIPTION_DEFAULT_VALUE,
             SaferPayConfig::FIELDS_LIBRARY => self::FIELDS_LIBRARY_DEFAULT_VALUE,
             SaferPayConfig::FIELDS_LIBRARY . SaferPayConfig::TEST_SUFFIX => self::FIELDS_LIBRARY_TEST_DEFAULT_VALUE,
             self::SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION => 0,
+            self::SAFERPAY_ORDER_ID_OPTION => 0,
             self::TEST_MODE => 1,
             self::HOSTED_FIELDS_TEMPLATE => self::HOSTED_FIELDS_TEMPLATE_DEFAULT,
             self::SAFERPAY_ORDER_STATE_CHOICE_AWAITING_PAYMENT => (int) Configuration::get(
@@ -479,6 +483,7 @@ public static function getUninstallConfiguration()
             self::FIELDS_LIBRARY,
             self::FIELDS_LIBRARY . self::TEST_SUFFIX,
             self::SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION,
+            self::SAFERPAY_ORDER_ID_OPTION,
             self::SAFERPAY_SEND_ORDER_CONF_MAIL,
             self::SAFERPAY_GROUP_CARDS,
         ];
diff --git a/src/Entity/index.php b/src/Entity/index.php
deleted file mode 100755
index ee6227264..000000000
--- a/src/Entity/index.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../');
-exit;
diff --git a/src/Install/AbstractInstaller.php b/src/Install/AbstractInstaller.php
index cbe8d897d..2188841f0 100755
--- a/src/Install/AbstractInstaller.php
+++ b/src/Install/AbstractInstaller.php
@@ -63,12 +63,6 @@ public function tabs()
                 'module_tab' => true,
                 'visible' => false,
             ],
-            [
-                'name' => $this->module->l('Fields'),
-                'class_name' => SaferPayOfficial::ADMIN_FIELDS_CONTROLLER,
-                'parent_class_name' => SaferPayOfficial::ADMIN_SAFERPAY_MODULE_CONTROLLER,
-                'module_tab' => true,
-            ],
             [
                 'name' => $this->module->l('Order'),
                 'class_name' => SaferPayOfficial::ADMIN_ORDER_CONTROLLER,
diff --git a/src/Service/Request/RequestObjectCreator.php b/src/Service/Request/RequestObjectCreator.php
index 6e961489f..21fc39835 100755
--- a/src/Service/Request/RequestObjectCreator.php
+++ b/src/Service/Request/RequestObjectCreator.php
@@ -118,14 +118,19 @@ public function createPayment(Cart $cart, $totalPrice)
         $payment = new Payment();
         $payment->setValue($totalPrice);
         $payment->setCurrencyCode($currency['iso_code']);
-        $payment->setDescription((string) Configuration::get(SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION));
 
-        if ((int) \Configuration::get(SaferPayConfig::SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION) && empty($order)) {
-            return $payment;
+        $description = (string) Configuration::get(SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION);
+        $orderIdOption = (int) Configuration::get(SaferPayConfig::SAFERPAY_ORDER_ID_OPTION);
+
+        if ($orderIdOption === 0 && !empty($order)) {
+            $payment->setDescription($order->reference);
+        } else {
+            $payment->setDescription($description);
         }
 
-        /** This param is not mandatory, but recommended **/
-        $payment->setOrderReference($order->reference);
+        if (!empty($order)) {
+            $payment->setOrderReference($order->reference);
+        }
 
         return $payment;
     }
diff --git a/src/Service/SettingsTranslationService.php b/src/Service/SettingsTranslationService.php
index 03d1545f2..ae2de9990 100644
--- a/src/Service/SettingsTranslationService.php
+++ b/src/Service/SettingsTranslationService.php
@@ -85,6 +85,7 @@ private function getCommonTranslations()
     {
         return [
             'saveChanges' => $this->module->l('Save Changes', self::FILE_NAME),
+            'saving' => $this->module->l('Saving...', self::FILE_NAME),
             'enable' => $this->module->l('Enable', self::FILE_NAME),
             'disable' => $this->module->l('Disable', self::FILE_NAME),
             'search' => $this->module->l('Search...', self::FILE_NAME),
@@ -121,6 +122,7 @@ private function getApiCredentialsTranslations()
             'merchantEmails' => $this->module->l('Merchant Emails', self::FILE_NAME),
             'enterMerchantEmails' => $this->module->l('Enter merchant email addresses (comma-separated)', self::FILE_NAME),
             'separateEmails' => $this->module->l('These email addresses receive payment notification emails directly from SaferPay. Separate multiple email addresses with commas.', self::FILE_NAME),
+            'invalidMerchantEmails' => $this->module->l('Invalid email address', self::FILE_NAME),
             'saferpayFields' => $this->module->l('Saferpay Fields', self::FILE_NAME),
             'saferpayFieldsDescription' => $this->module->l('Configure Saferpay Fields for inline payment form integration.', self::FILE_NAME),
             'fieldAccessTokenInfo' => $this->module->l('Saferpay Field Access Token can be found in Saferpay Backoffice, navigate to', self::FILE_NAME),
@@ -174,11 +176,12 @@ private function getPaymentProcessingTranslations()
             'chargeImmediately' => $this->module->l('Charge immediately', self::FILE_NAME),
             'authorize' => $this->module->l('Authorize', self::FILE_NAME),
             'reserveAndCaptureLater' => $this->module->l('Reserve and capture later', self::FILE_NAME),
-            'behaviourWhen3dsFails' => $this->module->l('Behaviour when 3D Secure fails', self::FILE_NAME),
+            'behaviourWhen3dsFails' => $this->module->l('Behavior when 3D Secure Payer Authentication was not successful and liability shift was not granted', self::FILE_NAME),
             'behaviourWhen3dsDescription' => $this->module->l('Default payment behavior for payment without 3-D Secure.', self::FILE_NAME),
             'cancel' => $this->module->l('Cancel', self::FILE_NAME),
             'rejectPayment' => $this->module->l('Reject the payment', self::FILE_NAME),
             'continueWithout3ds' => $this->module->l('Continue without 3DS', self::FILE_NAME),
+            'captureWithout3ds' => $this->module->l('Charge immediately', self::FILE_NAME),
             'restrictRefundAmount' => $this->module->l('Restrict RefundAmount to Captured Amount', self::FILE_NAME),
             'restrictRefundDescription' => $this->module->l('If set to true, the refund will be rejected if the sum of authorized refunds exceeds the capture value.', self::FILE_NAME),
             'orderCreationRule' => $this->module->l('Order creation rule', self::FILE_NAME),
@@ -187,7 +190,7 @@ private function getPaymentProcessingTranslations()
             'createWhenAuthorized' => $this->module->l('Create when authorized', self::FILE_NAME),
             'beforeAuthorization' => $this->module->l('Before authorization', self::FILE_NAME),
             'createBeforePayment' => $this->module->l('Create before payment', self::FILE_NAME),
-            'cardDisplaySaving' => $this->module->l('Card Display & Saving', self::FILE_NAME),
+            'cardDisplaySaving' => html_entity_decode($this->module->l('Card Display & Saving', self::FILE_NAME), ENT_QUOTES, 'UTF-8'),
             'cardDisplayDescription' => $this->module->l('Configure how cards appear at checkout and whether customers can save them.', self::FILE_NAME),
             'groupCardsLabel' => $this->module->l('Group debit/credit cards as \'Cards\' in checkout', self::FILE_NAME),
             'groupCardsDescription' => $this->module->l('If enabled, all supported card brands will be grouped and shown as a single \'Cards\' payment method at checkout.', self::FILE_NAME),
@@ -226,12 +229,22 @@ private function getGeneralSettingsTranslations()
             'stylingDescription' => $this->module->l('Customize the appearance of the payment page.', self::FILE_NAME),
             'configName' => $this->module->l('Payment Page configurations name', self::FILE_NAME),
             'enterConfigName' => $this->module->l('Enter configuration name', self::FILE_NAME),
-            'configNameDescription' => $this->module->l('This name is visible in payment page and also in payment confirmation email.', self::FILE_NAME),
+            'configNameDescription' => html_entity_decode($this->module->l('Name of the Payment Page Configuration created in Saferpay Backoffice (Settings > Payment Page Configuration). Max 20 characters. Allowed: letters, numbers, dots, colons, hyphens, underscores.', self::FILE_NAME), ENT_QUOTES, 'UTF-8'),
+            'hostedFieldInfo' => html_entity_decode($this->module->l('This style applies only to payment methods with "Custom form" enabled in the Payment Methods list. Methods without Custom form or paid with saved cards use the Saferpay-hosted payment page, whose appearance is controlled by "Payment Page configurations name".', self::FILE_NAME), ENT_QUOTES, 'UTF-8'),
+            'hostedFieldStyle' => $this->module->l('Hosted field style', self::FILE_NAME),
+            'hostedFieldStyleDescription' => $this->module->l('Select the card input form layout for the payment page.', self::FILE_NAME),
+            'classicLayout' => $this->module->l('Classic Layout', self::FILE_NAME),
+            'labeledLayout' => $this->module->l('Labeled Layout', self::FILE_NAME),
+            'inlineLayoutWithCard' => $this->module->l('Inline Layout with Card', self::FILE_NAME),
             'configuration' => $this->module->l('Configuration', self::FILE_NAME),
             'configurationDescription' => $this->module->l('General module configuration settings.', self::FILE_NAME),
             'description' => $this->module->l('Description', self::FILE_NAME),
             'enterDescription' => $this->module->l('Enter description', self::FILE_NAME),
             'descriptionHelp' => $this->module->l('This description is visible in payment page also in payment confirmation email.', self::FILE_NAME),
+            'orderReferenceOnPaymentPage' => $this->module->l('Order reference on payment page', self::FILE_NAME),
+            'usePrestaShopOrderReference' => $this->module->l('Use PrestaShop Order reference (default)', self::FILE_NAME),
+            'useDescriptionFieldValue' => $this->module->l('Use Description field value', self::FILE_NAME),
+            'orderReferenceFallbackInfo' => html_entity_decode($this->module->l('When "Use PrestaShop Order reference" is selected and the order is not yet created (e.g. order creation after authorization), the Description field value is used as fallback.', self::FILE_NAME), ENT_QUOTES, 'UTF-8'),
             'debugMode' => $this->module->l('Debug mode', self::FILE_NAME),
             'debugModeDescription' => $this->module->l('Enable debug mode to see more information in logs.', self::FILE_NAME),
         ];
diff --git a/translations/en.php b/translations/en.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/upgrade/install-1.0.3.php b/upgrade/install-1.0.3.php
index 2574c76e5..b4938c7f3 100755
--- a/upgrade/install-1.0.3.php
+++ b/upgrade/install-1.0.3.php
@@ -57,12 +57,5 @@ function upgrade_module_1_0_3($module)
         ADD COLUMN `authorized` TINYINT(1) DEFAULT 0'
     );
 
-    $installer = new \Invertus\SaferPay\Install\Installer($module);
-    $installer->installTab(
-        SaferPayOfficial::ADMIN_FIELDS_CONTROLLER,
-        SaferPayOfficial::ADMIN_SAFERPAY_MODULE_CONTROLLER,
-        $module->l('Fields')
-    );
-
     return $result;
 }
diff --git a/views/templates/admin/partials/field-hosted-field-template-desc.tpl b/upgrade/install-2.1.1.php
old mode 100755
new mode 100644
similarity index 75%
rename from views/templates/admin/partials/field-hosted-field-template-desc.tpl
rename to upgrade/install-2.1.1.php
index 8314405ef..b7b39ae00
--- a/views/templates/admin/partials/field-hosted-field-template-desc.tpl
+++ b/upgrade/install-2.1.1.php
@@ -1,4 +1,5 @@
-{**
+<?php
+/**
  *NOTICE OF LICENSE
  *
  *This source file is subject to the Open Software License (OSL 3.0)
@@ -18,7 +19,19 @@
  *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
  *@copyright SIX Payment Services
  *@license   SIX Payment Services
- *}
-<div class="alert alert-info">
-    {l s='Choose which hosted field will be displayed on payment option selection with supported payment methods' mod='saferpayofficial'}
-</div>
+ */
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_2_1_1()
+{
+    $tabId = Tab::getIdFromClassName('AdminSaferPayOfficialFields');
+    if ($tabId) {
+        $tab = new Tab($tabId);
+        $tab->delete();
+    }
+
+    return true;
+}
diff --git a/views/css/admin/logs_tab.css b/views/css/admin/logs_tab.css
index 5bb36a92f..702cff1ec 100755
--- a/views/css/admin/logs_tab.css
+++ b/views/css/admin/logs_tab.css
@@ -73,10 +73,31 @@
     border-bottom: solid 1px grey;
     pointer-events: all;
     display: flex;
-    justify-content: center;
+    justify-content: space-between;
+    align-items: center;
     max-height: 10vh;
 }
 
+.log-modal-close {
+    background: none;
+    border: none;
+    font-size: 1.5rem;
+    cursor: pointer;
+    padding: 0.25rem 0.5rem;
+    line-height: 1;
+    color: #6b7280;
+    margin-right: 0.5rem;
+}
+
+.log-modal-close:hover {
+    color: #111827;
+}
+
+.log-modal-close:focus {
+    outline: 2px solid #2196F3;
+    outline-offset: 2px;
+}
+
 .log-modal-content {
     padding: 15px;
     height: 50vh;
diff --git a/views/css/admin/payment_method.css b/views/css/admin/payment_method.css
index 336eda6f0..9b0b08c91 100755
--- a/views/css/admin/payment_method.css
+++ b/views/css/admin/payment_method.css
@@ -43,6 +43,12 @@
     width: 0;
 }
 
+/* Visible focus indicator for keyboard navigation */
+.container-checkbox input:focus ~ .checkmark {
+    outline: 2px solid #2196F3;
+    outline-offset: 2px;
+}
+
 /* Create a custom checkbox */
 .checkmark {
     position: absolute;
diff --git a/views/css/admin/saferpay_fields.css b/views/css/admin/saferpay_fields.css
deleted file mode 100755
index 064c2c333..000000000
--- a/views/css/admin/saferpay_fields.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-
-/* HIDE RADIO */
-[type=radio] {
-    position: absolute;
-    opacity: 0;
-    width: 0;
-    height: 0;
-}
-
-/* IMAGE STYLES */
-[type=radio] + img {
-    cursor: pointer;
-}
-
-/* CHECKED STYLES */
-[type=radio]:checked + img {
-    outline: 2px solid #f00;
-}
-
-.field-label {
-    flex: 0 0 23%;
-    margin-bottom:30px !important;
-}
-
-.field-container {
-    display: flex;
-    flex-wrap: wrap;
-}
diff --git a/views/js/admin/log.js b/views/js/admin/log.js
index 4a8eb769a..a16cecc4b 100644
--- a/views/js/admin/log.js
+++ b/views/js/admin/log.js
@@ -21,17 +21,65 @@
  */
 
 $(document).ready(function () {
+    function closeModal($modal) {
+        $modal.removeClass('open');
+        var triggerButton = $modal.data('triggerButton');
+        if (triggerButton) {
+            triggerButton.focus();
+        }
+    }
+
     $('.log-modal-overlay').on('click', function (event) {
-        $('.modal.open').removeClass('open');
+        closeModal($(this).closest('.modal'));
+        event.preventDefault();
+    });
+
+    $('.js-log-modal-close').on('click', function (event) {
+        closeModal($(this).closest('.modal'));
         event.preventDefault();
     });
 
+    $(document).on('keydown', function (event) {
+        var $openModal = $('.modal.open');
+        if (!$openModal.length) {
+            return;
+        }
+        if (event.key === 'Escape') {
+            closeModal($openModal);
+            event.preventDefault();
+            return;
+        }
+        if (event.key === 'Tab') {
+            var focusables = $openModal.find('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])').filter(':visible');
+            if (!focusables.length) {
+                event.preventDefault();
+                return;
+            }
+            var first = focusables.first()[0];
+            var last = focusables.last()[0];
+            if (event.shiftKey && document.activeElement === first) {
+                last.focus();
+                event.preventDefault();
+            } else if (!event.shiftKey && document.activeElement === last) {
+                first.focus();
+                event.preventDefault();
+            } else if (!$openModal[0].contains(document.activeElement)) {
+                first.focus();
+                event.preventDefault();
+            }
+        }
+    });
+
     $('.js-log-button').on('click', function (event) {
         var logId = $(this).data('log-id');
         var informationType = $(this).data('information-type');
+        var $modal = $('#' + $(this).data('target'));
+
+        $modal.data('triggerButton', $(this));
 
         // NOTE: opening modal
-        $('#' + $(this).data('target')).addClass('open');
+        $modal.addClass('open');
+        $modal.find('.js-log-modal-close').focus();
 
         // NOTE: if information has been set already we don't need to call ajax again.
         if (!$('#log-modal-' + logId + '-' + informationType + ' .log-modal-content-data').hasClass('hidden')) {
diff --git a/views/js/admin/saferpay_settings.js b/views/js/admin/saferpay_settings.js
index 6407bc177..72f482b10 100755
--- a/views/js/admin/saferpay_settings.js
+++ b/views/js/admin/saferpay_settings.js
@@ -20,16 +20,23 @@
  *@license   SIX Payment Services
  */
 
-$(document).ready(function (e) {
-    $("input[name='SAFERPAY_CONFIGURATION_NAME']").keypress(function (e) {
-        //disable symbols
+$(document).ready(function () {
+    var $configInput = $("input[name='SAFERPAY_CONFIGURATION_NAME']");
+
+    $configInput.attr('maxlength', 20);
+
+    $configInput.keypress(function (e) {
         var txt = String.fromCharCode(e.which);
-        if (!txt.match(/[A-Za-z0-9&. ]/)) {
-            return false;
-        }
-        // disable space
-        if (e.keyCode === 32) {
+        if (!txt.match(/[A-Za-z0-9.:\-_]/)) {
             return false;
         }
     });
+
+    $configInput.on('paste', function (e) {
+        var $input = $(this);
+        setTimeout(function () {
+            var cleaned = $input.val().replace(/[^A-Za-z0-9.:\-_]/g, '').substring(0, 20);
+            $input.val(cleaned);
+        }, 0);
+    });
 });
\ No newline at end of file
diff --git a/views/js/admin/settings-app/src/components/settings/api-credentials.tsx b/views/js/admin/settings-app/src/components/settings/api-credentials.tsx
index 5a3931901..d806211bc 100644
--- a/views/js/admin/settings-app/src/components/settings/api-credentials.tsx
+++ b/views/js/admin/settings-app/src/components/settings/api-credentials.tsx
@@ -35,6 +35,14 @@ export function ApiCredentials() {
   const fieldJsUrl = isTest ? settings.testFieldJsUrl : settings.liveFieldJsUrl
 
   const hasCredentials = username.length > 0 && password.length > 0
+  const hasBusinessLicense = isTest ? settings.testHasBusinessLicense : settings.liveHasBusinessLicense
+
+  const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  const invalidEmails = merchantEmails
+    .split(',')
+    .map(e => e.trim())
+    .filter(e => e.length > 0 && !EMAIL_RE.test(e))
+  const merchantEmailsInvalid = invalidEmails.length > 0
 
   const setField = (field: string, value: string | boolean) => {
     updateSettings({ [`${prefix}${field.charAt(0).toUpperCase() + field.slice(1)}`]: value } as Record<string, string | boolean>)
@@ -145,17 +153,23 @@ export function ApiCredentials() {
             {/* Username & Password */}
             <div className="sp-grid sp-gap-5 md:sp-grid-cols-2">
               <div className="sp-flex sp-flex-col sp-gap-2">
-                <Label htmlFor="api-username">{t('jsonApiUsername')}</Label>
+                <Label htmlFor="api-username">
+                  {t('jsonApiUsername')} <span className="sp-text-destructive" aria-hidden="true">*</span>
+                </Label>
                 <Input
                   id="api-username"
                   type="text"
                   placeholder={t('enterApiUsername', envLabel.toLowerCase())}
                   value={username}
                   onChange={(e) => setField('username', e.target.value)}
+                  required
+                  aria-required="true"
                 />
               </div>
               <div className="sp-flex sp-flex-col sp-gap-2">
-                <Label htmlFor="api-password">{t('jsonApiPassword')}</Label>
+                <Label htmlFor="api-password">
+                  {t('jsonApiPassword')} <span className="sp-text-destructive" aria-hidden="true">*</span>
+                </Label>
                 <div className="sp-relative">
                   <Input
                     id="api-password"
@@ -164,11 +178,13 @@ export function ApiCredentials() {
                     value={password}
                     onChange={(e) => setField('password', e.target.value)}
                     className="sp-pr-10"
+                    required
+                    aria-required="true"
                   />
                   <button
                     type="button"
                     onClick={() => setShowApiPassword(!showApiPassword)}
-                    className="sp-absolute sp-right-3 sp-top-1/2 sp--translate-y-1/2 sp-text-muted-foreground hover:sp-text-foreground sp-transition-colors"
+                    className="sp-absolute sp-right-3 sp-top-1/2 sp--translate-y-1/2 sp-text-muted-foreground hover:sp-text-foreground sp-transition-colors sp-p-1 sp-min-w-[24px] sp-min-h-[24px] sp-flex sp-items-center sp-justify-center"
                     aria-label={showApiPassword ? t('hidePassword') : t('showPassword')}
                   >
                     {showApiPassword ? <EyeOff className="sp-h-4 sp-w-4" /> : <Eye className="sp-h-4 sp-w-4" />}
@@ -185,7 +201,7 @@ export function ApiCredentials() {
               </div>
             )}
             {credentialStatus === 'valid' && (
-              <div className="sp-flex sp-items-center sp-gap-2 sp-text-sm sp-text-emerald-600">
+              <div className="sp-flex sp-items-center sp-gap-2 sp-text-sm sp-text-emerald-700">
                 <CheckCircle2 className="sp-h-4 sp-w-4" />
                 {t('credentialsValid')}
               </div>
@@ -233,7 +249,14 @@ export function ApiCredentials() {
                 placeholder={t('enterMerchantEmails')}
                 value={merchantEmails}
                 onChange={(e) => setField('merchantEmails', e.target.value)}
+                aria-invalid={merchantEmailsInvalid}
+                className={merchantEmailsInvalid ? 'sp-border-destructive focus-visible:sp-ring-destructive' : ''}
               />
+              {merchantEmailsInvalid && (
+                <p className="sp-text-xs sp-text-destructive">
+                  {t('invalidMerchantEmails')}: {invalidEmails.join(', ')}
+                </p>
+              )}
               <p className="sp-text-xs sp-text-muted-foreground">
                 {t('separateEmails')}
               </p>
@@ -242,7 +265,7 @@ export function ApiCredentials() {
         </CardContent>
       </Card>
 
-      {settings.hasBusinessLicense && <Card>
+      {hasBusinessLicense && <Card>
         <CardHeader>
           <CardTitle className="sp-text-base sp-font-semibold">{t('saferpayFields')}</CardTitle>
           <CardDescription>{t('saferpayFieldsDescription')}</CardDescription>
@@ -250,12 +273,12 @@ export function ApiCredentials() {
         <CardContent>
           <div className="sp-grid sp-gap-5">
             <div className="sp-flex sp-items-center sp-gap-3 sp-rounded-lg sp-bg-emerald-50 sp-border sp-border-emerald-200 sp-px-4 sp-py-3">
-              <CheckCircle2 className="sp-h-5 sp-w-5 sp-shrink-0 sp-text-emerald-600" />
+              <CheckCircle2 className="sp-h-5 sp-w-5 sp-shrink-0 sp-text-emerald-700" />
               <div className="sp-flex sp-flex-col sp-gap-0.5">
                 <p className="sp-mb-0 sp-text-sm sp-font-medium sp-text-emerald-800">
                   {t('saferpayFieldsIncluded')}
                 </p>
-                <p className="sp-mb-0 sp-text-xs sp-text-emerald-600">
+                <p className="sp-mb-0 sp-text-xs sp-text-emerald-700">
                   {t('saferpayFieldsIncludedDescription')}
                 </p>
               </div>
@@ -330,7 +353,12 @@ export function ApiCredentials() {
       </Card>}
 
       <div className="sp-flex sp-justify-end">
-        <Button className="sp-min-w-[120px]" onClick={saveCredentials} disabled={saving}>
+        <Button
+          className="sp-min-w-[120px]"
+          onClick={saveCredentials}
+          disabled={saving || !hasCredentials || credentialStatus === 'invalid' || credentialStatus === 'checking' || merchantEmailsInvalid}
+          aria-label={saving ? t('saving') : undefined}
+        >
           {saving ? <Loader2 className="sp-h-4 sp-w-4 sp-animate-spin" /> : t('saveChanges')}
         </Button>
       </div>
diff --git a/views/js/admin/settings-app/src/components/settings/email-notifications.tsx b/views/js/admin/settings-app/src/components/settings/email-notifications.tsx
index 044239c82..d79d331ac 100644
--- a/views/js/admin/settings-app/src/components/settings/email-notifications.tsx
+++ b/views/js/admin/settings-app/src/components/settings/email-notifications.tsx
@@ -90,7 +90,7 @@ export function EmailNotifications() {
       </Card>
 
       <div className="sp-flex sp-justify-end">
-        <Button className="sp-min-w-[120px]" onClick={saveEmailSettings} disabled={saving}>
+        <Button className="sp-min-w-[120px]" onClick={saveEmailSettings} disabled={saving} aria-label={saving ? t('saving') : undefined}>
           {saving ? <Loader2 className="sp-h-4 sp-w-4 sp-animate-spin" /> : t('saveChanges')}
         </Button>
       </div>
diff --git a/views/js/admin/settings-app/src/components/settings/general-settings.tsx b/views/js/admin/settings-app/src/components/settings/general-settings.tsx
index 70f74b738..52b795687 100644
--- a/views/js/admin/settings-app/src/components/settings/general-settings.tsx
+++ b/views/js/admin/settings-app/src/components/settings/general-settings.tsx
@@ -3,8 +3,9 @@ import { Label } from '@/components/ui/label'
 import { Input } from '@/components/ui/input'
 import { Button } from '@/components/ui/button'
 import { Switch } from '@/components/ui/switch'
+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
-import { Settings2, Paintbrush, ClipboardList, Loader2 } from 'lucide-react'
+import { Settings2, Paintbrush, ClipboardList, Loader2, Info } from 'lucide-react'
 import { useSettings } from '@/context/settings-context'
 import { t } from '@/utils/translations'
 
@@ -71,14 +72,60 @@ export function GeneralSettings() {
             <Input
               id="page-config-name"
               type="text"
+              maxLength={20}
               placeholder={t('enterConfigName')}
               value={settings.configurationName}
-              onChange={(e) => updateSettings({ configurationName: e.target.value })}
+              onChange={(e) => {
+                const cleaned = e.target.value.replace(/[^A-Za-z0-9.:\-_]/g, '')
+                updateSettings({ configurationName: cleaned })
+              }}
             />
             <p className="sp-text-xs sp-text-muted-foreground">
               {t('configNameDescription')}
             </p>
           </div>
+
+          {/* Hosted field info banner */}
+          <div className="sp-flex sp-items-center sp-justify-center sp-gap-3 sp-rounded-lg sp-border sp-bg-secondary/50 sp-px-5 sp-py-4 sp-mt-4">
+            <Info className="sp-h-5 sp-w-5 sp-text-primary sp-shrink-0" />
+            <p className="sp-text-sm sp-text-foreground sp-m-0">
+              {t('hostedFieldInfo')}
+            </p>
+          </div>
+
+          {/* Hosted field style selector */}
+          <div className="sp-flex sp-gap-6 sp-mt-4">
+            <div className="sp-flex sp-flex-col sp-gap-2 sp-shrink-0">
+              <Label className="sp-text-sm sp-font-medium">{t('hostedFieldStyle')}</Label>
+              <Select
+                value={String(settings.hostedFieldsTemplate)}
+                onValueChange={(val) => updateSettings({ hostedFieldsTemplate: Number(val) })}
+              >
+                <SelectTrigger className="sp-w-[220px]" aria-label={t('hostedFieldStyle')}>
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="1">{t('classicLayout')}</SelectItem>
+                  <SelectItem value="2">{t('labeledLayout')}</SelectItem>
+                  <SelectItem value="3">{t('inlineLayoutWithCard')}</SelectItem>
+                </SelectContent>
+              </Select>
+              <p className="sp-text-xs sp-text-muted-foreground sp-max-w-[220px]">
+                {t('hostedFieldStyleDescription')}
+              </p>
+            </div>
+            <div className="sp-flex-1 sp-flex sp-items-center sp-justify-center sp-rounded-lg sp-bg-secondary/30 sp-p-4">
+              <img
+                src={`${settings.modulePath}views/img/hosted-templates/template${settings.hostedFieldsTemplate}.jpg`}
+                alt={
+                  settings.hostedFieldsTemplate === 1 ? t('classicLayout') :
+                  settings.hostedFieldsTemplate === 2 ? t('labeledLayout') :
+                  t('inlineLayoutWithCard')
+                }
+                className="sp-max-w-full sp-h-auto sp-rounded"
+              />
+            </div>
+          </div>
         </CardContent>
       </Card>
 
@@ -97,17 +144,60 @@ export function GeneralSettings() {
         </CardHeader>
         <CardContent>
           <div className="sp-grid sp-gap-5">
-            <div className="sp-flex sp-flex-col sp-gap-2">
-              <Label htmlFor="description">{t('description')}</Label>
-              <Input
-                id="description"
-                type="text"
-                placeholder={t('enterDescription')}
-                value={settings.paymentDescription}
-                onChange={(e) => updateSettings({ paymentDescription: e.target.value })}
-              />
-              <p className="sp-text-xs sp-text-muted-foreground">
-                {t('descriptionHelp')}
+            {/* Order reference on payment page */}
+            <div className="sp-flex sp-flex-col sp-gap-3">
+              <Label className="sp-text-sm sp-font-medium">{t('orderReferenceOnPaymentPage')}</Label>
+              <RadioGroup
+                value={String(settings.orderIdOption)}
+                onValueChange={(val) => updateSettings({ orderIdOption: Number(val) })}
+                className="sp-flex sp-flex-col sp-gap-3"
+              >
+                <label
+                  htmlFor="order-id-prestashop"
+                  className={`sp-flex sp-cursor-pointer sp-items-center sp-gap-3 sp-rounded-lg sp-border sp-px-4 sp-py-3 sp-transition-colors ${
+                    settings.orderIdOption === 0
+                      ? 'sp-border-primary sp-bg-primary/5'
+                      : 'sp-border-border hover:sp-bg-secondary/50'
+                  }`}
+                >
+                  <RadioGroupItem value="0" id="order-id-prestashop" />
+                  <span className="sp-text-sm sp-font-medium">{t('usePrestaShopOrderReference')}</span>
+                </label>
+                <label
+                  htmlFor="order-id-description"
+                  className={`sp-flex sp-cursor-pointer sp-items-center sp-gap-3 sp-rounded-lg sp-border sp-px-4 sp-py-3 sp-transition-colors ${
+                    settings.orderIdOption === 1
+                      ? 'sp-border-primary sp-bg-primary/5'
+                      : 'sp-border-border hover:sp-bg-secondary/50'
+                  }`}
+                >
+                  <RadioGroupItem value="1" id="order-id-description" />
+                  <span className="sp-text-sm sp-font-medium">{t('useDescriptionFieldValue')}</span>
+                </label>
+              </RadioGroup>
+            </div>
+
+            {settings.orderIdOption === 1 && (
+              <div className="sp-flex sp-flex-col sp-gap-2">
+                <Label htmlFor="description">{t('description')}</Label>
+                <Input
+                  id="description"
+                  type="text"
+                  placeholder={t('enterDescription')}
+                  value={settings.paymentDescription}
+                  onChange={(e) => updateSettings({ paymentDescription: e.target.value })}
+                />
+                <p className="sp-text-xs sp-text-muted-foreground">
+                  {t('descriptionHelp')}
+                </p>
+              </div>
+            )}
+
+            {/* Info banner */}
+            <div className="sp-flex sp-items-center sp-justify-center sp-gap-3 sp-rounded-lg sp-border sp-bg-secondary/50 sp-px-5 sp-py-4">
+              <Info className="sp-h-5 sp-w-5 sp-text-primary sp-shrink-0" />
+              <p className="sp-text-sm sp-text-foreground">
+                {t('orderReferenceFallbackInfo')}
               </p>
             </div>
 
@@ -131,7 +221,7 @@ export function GeneralSettings() {
       </Card>
 
       <div className="sp-flex sp-justify-end">
-        <Button className="sp-min-w-[120px]" onClick={saveGeneralSettings} disabled={saving}>
+        <Button className="sp-min-w-[120px]" onClick={saveGeneralSettings} disabled={saving} aria-label={saving ? t('saving') : undefined}>
           {saving ? <Loader2 className="sp-h-4 sp-w-4 sp-animate-spin" /> : t('saveChanges')}
         </Button>
       </div>
diff --git a/views/js/admin/settings-app/src/components/settings/payment-methods.tsx b/views/js/admin/settings-app/src/components/settings/payment-methods.tsx
index bc3fc449f..99dfd735a 100644
--- a/views/js/admin/settings-app/src/components/settings/payment-methods.tsx
+++ b/views/js/admin/settings-app/src/components/settings/payment-methods.tsx
@@ -31,15 +31,28 @@ function MultiSelect({
     [options, search],
   )
 
+  const ALL_VALUE = 0
+
+  const validSelected = useMemo(
+    () => selected.filter((s) => s !== ALL_VALUE && options.some((o) => o.id === s)),
+    [selected, options],
+  )
+
+  const isAll = selected.includes(ALL_VALUE) || validSelected.length === 0
+
   const toggle = useCallback(
     (value: number) => {
-      onChange(
-        selected.includes(value)
-          ? selected.filter((s) => s !== value)
-          : [...selected, value],
-      )
+      if (value === ALL_VALUE) {
+        onChange([ALL_VALUE])
+        return
+      }
+      const base = isAll ? [] : validSelected
+      const next = base.includes(value)
+        ? base.filter((s) => s !== value)
+        : [...base, value]
+      onChange(next.length === 0 ? [ALL_VALUE] : next)
     },
-    [selected, onChange],
+    [validSelected, isAll, onChange],
   )
 
   return (
@@ -48,14 +61,18 @@ function MultiSelect({
         <button
           type="button"
           className="sp-flex sp-min-h-[36px] sp-w-full sp-items-center sp-justify-between sp-rounded-md sp-border sp-border-border sp-bg-card sp-px-3 sp-py-1.5 sp-text-left sp-text-sm sp-transition-colors hover:sp-bg-secondary/50 focus-visible:sp-outline-none focus-visible:sp-ring-2 focus-visible:sp-ring-ring"
-          aria-label={label}
+          aria-label={isAll ? `${label}: ${placeholder.replace(/^Select\s+/i, 'All ')}` : validSelected.length === 0 ? `${label}: ${placeholder}` : `${label}: ${validSelected.length} ${t('selected')}`}
         >
-          {selected.length === 0 ? (
+          {isAll ? (
+            <Badge variant="secondary" className="sp-text-xs sp-font-normal">
+              {placeholder.replace(/^Select\s+/i, 'All ')}
+            </Badge>
+          ) : validSelected.length === 0 ? (
             <span className="sp-text-muted-foreground">{placeholder}</span>
           ) : (
             <span className="sp-flex sp-flex-wrap sp-gap-1">
-              {selected.length <= 2 ? (
-                selected.map((s) => {
+              {validSelected.length <= 2 ? (
+                validSelected.map((s) => {
                   const opt = options.find((o) => o.id === s)
                   return (
                     <Badge key={s} variant="secondary" className="sp-text-xs sp-font-normal">
@@ -65,7 +82,7 @@ function MultiSelect({
                 })
               ) : (
                 <Badge variant="secondary" className="sp-text-xs sp-font-normal">
-                  {selected.length} {t('selected')}
+                  {validSelected.length} {t('selected')}
                 </Badge>
               )}
             </span>
@@ -92,7 +109,7 @@ function MultiSelect({
               className="sp-flex sp-cursor-pointer sp-items-center sp-gap-2 sp-rounded-sm sp-px-2 sp-py-1.5 sp-text-sm hover:sp-bg-accent"
             >
               <Checkbox
-                checked={selected.includes(option.id)}
+                checked={option.id === ALL_VALUE ? isAll : validSelected.includes(option.id)}
                 onCheckedChange={() => toggle(option.id)}
               />
               <span className="sp-text-sm">{option.name}</span>
@@ -104,11 +121,11 @@ function MultiSelect({
             </p>
           )}
         </div>
-        {selected.length > 0 && (
+        {validSelected.length > 0 && (
           <div className="sp-border-t sp-p-2">
             <button
               type="button"
-              onClick={() => onChange([])}
+              onClick={() => onChange([ALL_VALUE])}
               className="sp-w-full sp-rounded-sm sp-px-2 sp-py-1 sp-text-xs sp-text-muted-foreground hover:sp-text-foreground sp-transition-colors"
             >
               {t('clearAll')}
@@ -243,6 +260,7 @@ export function PaymentMethods() {
                       <Switch
                         checked={method.showLogos}
                         onCheckedChange={(checked) => updatePaymentMethod(method.name, { showLogos: checked })}
+                        aria-label={`${t('logos')} ${method.displayName}`}
                       />
                     </div>
                     {method.hasCustomForm && (
@@ -251,6 +269,7 @@ export function PaymentMethods() {
                         <Switch
                           checked={method.showCustomForm}
                           onCheckedChange={(checked) => updatePaymentMethod(method.name, { showCustomForm: checked })}
+                          aria-label={`${t('customForm')} ${method.displayName}`}
                         />
                       </div>
                     )}
@@ -293,7 +312,7 @@ export function PaymentMethods() {
 
       {paymentMethods.length > 0 && (
         <div className="sp-flex sp-justify-end">
-          <Button className="sp-min-w-[120px]" onClick={savePaymentMethods} disabled={saving}>
+          <Button className="sp-min-w-[120px]" onClick={savePaymentMethods} disabled={saving} aria-label={saving ? t('saving') : undefined}>
             {saving ? <Loader2 className="sp-h-4 sp-w-4 sp-animate-spin" /> : t('saveChanges')}
           </Button>
         </div>
diff --git a/views/js/admin/settings-app/src/components/settings/payment-processing.tsx b/views/js/admin/settings-app/src/components/settings/payment-processing.tsx
index a24ad5ba7..3d26f72da 100644
--- a/views/js/admin/settings-app/src/components/settings/payment-processing.tsx
+++ b/views/js/admin/settings-app/src/components/settings/payment-processing.tsx
@@ -113,6 +113,20 @@ export function PaymentProcessing() {
                     <span className="sp-text-xs sp-text-muted-foreground">{t('continueWithout3ds')}</span>
                   </div>
                 </label>
+                <label
+                  htmlFor="3ds-capture"
+                  className={`sp-flex sp-flex-1 sp-cursor-pointer sp-items-center sp-gap-3 sp-rounded-lg sp-border sp-px-4 sp-py-3 sp-transition-colors ${
+                    settings.paymentBehaviorWithout3D === 2
+                      ? 'sp-border-primary sp-bg-primary/5'
+                      : 'sp-border-border hover:sp-bg-secondary/50'
+                  }`}
+                >
+                  <RadioGroupItem value="2" id="3ds-capture" />
+                  <div className="sp-flex sp-flex-col">
+                    <span className="sp-text-sm sp-font-medium">{t('capture')}</span>
+                    <span className="sp-text-xs sp-text-muted-foreground">{t('captureWithout3ds')}</span>
+                  </div>
+                </label>
               </RadioGroup>
             </div>
 
@@ -291,7 +305,7 @@ export function PaymentProcessing() {
       </Card>
 
       <div className="sp-flex sp-justify-end">
-        <Button className="sp-min-w-[120px]" onClick={savePaymentProcessing} disabled={saving}>
+        <Button className="sp-min-w-[120px]" onClick={savePaymentProcessing} disabled={saving} aria-label={saving ? t('saving') : undefined}>
           {saving ? <Loader2 className="sp-h-4 sp-w-4 sp-animate-spin" /> : t('saveChanges')}
         </Button>
       </div>
diff --git a/views/js/admin/settings-app/src/components/settings/saferpay-settings.tsx b/views/js/admin/settings-app/src/components/settings/saferpay-settings.tsx
index 0d8649911..93b02197c 100644
--- a/views/js/admin/settings-app/src/components/settings/saferpay-settings.tsx
+++ b/views/js/admin/settings-app/src/components/settings/saferpay-settings.tsx
@@ -24,6 +24,7 @@ export function SaferpaySettings() {
         <TabsList className="sp-h-auto sp-w-full sp-justify-start sp-gap-1 sp-rounded-lg sp-bg-white sp-border sp-border-border sp-p-1">
           <TabsTrigger
             value="credentials"
+            aria-label={t('tabApiCredentials')}
             className="sp-flex sp-items-center sp-gap-2 sp-rounded-md sp-px-2.5 sp-py-2.5 sm:sp-px-4 sp-text-sm sp-font-normal sp-bg-transparent data-[state=active]:sp-bg-primary data-[state=active]:sp-text-primary-foreground data-[state=active]:sp-shadow-none"
           >
             <Key className="sp-h-4 sp-w-4 sp-shrink-0" />
@@ -31,6 +32,7 @@ export function SaferpaySettings() {
           </TabsTrigger>
           <TabsTrigger
             value="methods"
+            aria-label={t('tabPaymentMethods')}
             className="sp-flex sp-items-center sp-gap-2 sp-rounded-md sp-px-2.5 sp-py-2.5 sm:sp-px-4 sp-text-sm sp-font-normal sp-bg-transparent data-[state=active]:sp-bg-primary data-[state=active]:sp-text-primary-foreground data-[state=active]:sp-shadow-none"
           >
             <Wallet className="sp-h-4 sp-w-4 sp-shrink-0" />
@@ -38,6 +40,7 @@ export function SaferpaySettings() {
           </TabsTrigger>
           <TabsTrigger
             value="payment"
+            aria-label={t('tabPaymentProcessing')}
             className="sp-flex sp-items-center sp-gap-2 sp-rounded-md sp-px-2.5 sp-py-2.5 sm:sp-px-4 sp-text-sm sp-font-normal sp-bg-transparent data-[state=active]:sp-bg-primary data-[state=active]:sp-text-primary-foreground data-[state=active]:sp-shadow-none"
           >
             <CreditCard className="sp-h-4 sp-w-4 sp-shrink-0" />
@@ -45,6 +48,7 @@ export function SaferpaySettings() {
           </TabsTrigger>
           <TabsTrigger
             value="email"
+            aria-label={t('tabEmailNotifications')}
             className="sp-flex sp-items-center sp-gap-2 sp-rounded-md sp-px-2.5 sp-py-2.5 sm:sp-px-4 sp-text-sm sp-font-normal sp-bg-transparent data-[state=active]:sp-bg-primary data-[state=active]:sp-text-primary-foreground data-[state=active]:sp-shadow-none"
           >
             <Mail className="sp-h-4 sp-w-4 sp-shrink-0" />
@@ -52,6 +56,7 @@ export function SaferpaySettings() {
           </TabsTrigger>
           <TabsTrigger
             value="general"
+            aria-label={t('tabGeneralSettings')}
             className="sp-flex sp-items-center sp-gap-2 sp-rounded-md sp-px-2.5 sp-py-2.5 sm:sp-px-4 sp-text-sm sp-font-normal sp-bg-transparent data-[state=active]:sp-bg-primary data-[state=active]:sp-text-primary-foreground data-[state=active]:sp-shadow-none"
           >
             <Settings2 className="sp-h-4 sp-w-4 sp-shrink-0" />
diff --git a/views/js/admin/settings-app/src/components/settings/toast-container.tsx b/views/js/admin/settings-app/src/components/settings/toast-container.tsx
index 39d96074d..0b5f905db 100644
--- a/views/js/admin/settings-app/src/components/settings/toast-container.tsx
+++ b/views/js/admin/settings-app/src/components/settings/toast-container.tsx
@@ -15,7 +15,9 @@ export function ToastContainer() {
           className={`sp-rounded-lg sp-border sp-px-4 sp-py-3 sp-shadow-lg sp-text-sm sp-animate-in sp-slide-in-from-bottom-2 ${
             t.variant === 'destructive'
               ? 'sp-bg-destructive sp-text-destructive-foreground sp-border-destructive'
-              : 'sp-bg-emerald-600 sp-text-white sp-border-emerald-700'
+              : t.variant === 'warning'
+                ? 'sp-bg-amber-500 sp-text-white sp-border-amber-600'
+                : 'sp-bg-emerald-600 sp-text-white sp-border-emerald-700'
           }`}
         >
           {t.title && <div className="sp-font-medium">{t.title}</div>}
diff --git a/views/js/admin/settings-app/src/context/settings-context.tsx b/views/js/admin/settings-app/src/context/settings-context.tsx
index 6abb19d36..784cf7fb1 100644
--- a/views/js/admin/settings-app/src/context/settings-context.tsx
+++ b/views/js/admin/settings-app/src/context/settings-context.tsx
@@ -48,7 +48,7 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
   }, [])
 
   const handleSave = useCallback(async (
-    saveFn: () => Promise<{ success: boolean; message?: string }>,
+    saveFn: () => Promise<{ success: boolean; message?: string; warning?: boolean }>,
     label: string,
     section: SavingSection,
   ) => {
@@ -56,7 +56,8 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
     try {
       const result = await saveFn()
       if (result.success) {
-        toast({ title: result.message || t('savedSuccessfully', label), variant: 'default' })
+        const variant = result.warning ? 'warning' : 'default'
+        toast({ title: result.message || t('savedSuccessfully', label), variant })
       } else {
         toast({ title: result.message || t('failedToSave', label), variant: 'destructive' })
       }
@@ -91,10 +92,14 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
         liveFieldJsUrl: currentSettings.liveFieldJsUrl,
       })
       const data = result as unknown as Record<string, unknown>
-      if (result.success && typeof data.hasBusinessLicense === 'boolean') {
-        setSettings((prev) => ({ ...prev, hasBusinessLicense: data.hasBusinessLicense as boolean }))
+      if (result.success) {
+        setSettings((prev) => ({
+          ...prev,
+          ...(typeof data.testHasBusinessLicense === 'boolean' ? { testHasBusinessLicense: data.testHasBusinessLicense as boolean } : {}),
+          ...(typeof data.liveHasBusinessLicense === 'boolean' ? { liveHasBusinessLicense: data.liveHasBusinessLicense as boolean } : {}),
+        }))
       }
-      return result
+      return { ...result, warning: data.warning === true }
     }, 'API Credentials', 'credentials')
   }, [handleSave])
 
@@ -126,6 +131,8 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
       orderStateAwaitingPayment: currentSettings.orderStateAwaitingPayment,
       paymentDescription: currentSettings.paymentDescription,
       configurationName: currentSettings.configurationName,
+      hostedFieldsTemplate: currentSettings.hostedFieldsTemplate,
+      orderIdOption: currentSettings.orderIdOption,
       debugMode: currentSettings.debugMode,
     }), 'General Settings', 'generalSettings')
   }, [handleSave])
diff --git a/views/js/admin/settings-app/src/globals.css b/views/js/admin/settings-app/src/globals.css
index 084c1fe3b..b222286c7 100644
--- a/views/js/admin/settings-app/src/globals.css
+++ b/views/js/admin/settings-app/src/globals.css
@@ -14,7 +14,7 @@
   --sp-secondary: 180 15% 95%;
   --sp-secondary-foreground: 220 20% 10%;
   --sp-muted: 180 12% 95%;
-  --sp-muted-foreground: 220 10% 46%;
+  --sp-muted-foreground: 220 12% 38%;
   --sp-accent: 180 25% 92%;
   --sp-accent-foreground: 180 51% 22%;
   --sp-destructive: 0 72% 51%;
diff --git a/views/js/admin/settings-app/src/hooks/use-toast.ts b/views/js/admin/settings-app/src/hooks/use-toast.ts
index ec2103412..f0af5fe04 100644
--- a/views/js/admin/settings-app/src/hooks/use-toast.ts
+++ b/views/js/admin/settings-app/src/hooks/use-toast.ts
@@ -7,7 +7,7 @@ export interface ToasterToast {
   id: string
   title?: string
   description?: string
-  variant?: 'default' | 'destructive'
+  variant?: 'default' | 'destructive' | 'warning'
 }
 
 type Action =
diff --git a/views/js/admin/settings-app/src/types/index.ts b/views/js/admin/settings-app/src/types/index.ts
index a8c88e052..79bf8e2ae 100644
--- a/views/js/admin/settings-app/src/types/index.ts
+++ b/views/js/admin/settings-app/src/types/index.ts
@@ -33,8 +33,9 @@ export interface SaferpaySettingsData {
   liveFieldAccessToken: string
   liveFieldJsUrl: string
 
-  // License (read-only, auto-detected from API)
-  hasBusinessLicense: boolean
+  // License (read-only, auto-detected from API, per environment)
+  testHasBusinessLicense: boolean
+  liveHasBusinessLicense: boolean
 
   // Payment Processing
   paymentBehavior: number
@@ -54,6 +55,9 @@ export interface SaferpaySettingsData {
   orderStateAwaitingPayment: number
   paymentDescription: string
   configurationName: string
+  hostedFieldsTemplate: number
+  modulePath: string
+  orderIdOption: number
   debugMode: boolean
 
   // Reference data
diff --git a/views/templates/admin/field-option-settings/helpers/index.php b/views/templates/admin/field-option-settings/helpers/index.php
deleted file mode 100755
index ee6227264..000000000
--- a/views/templates/admin/field-option-settings/helpers/index.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../');
-exit;
diff --git a/views/templates/admin/field-option-settings/helpers/options/index.php b/views/templates/admin/field-option-settings/helpers/options/index.php
deleted file mode 100755
index ee6227264..000000000
--- a/views/templates/admin/field-option-settings/helpers/options/index.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../');
-exit;
diff --git a/views/templates/admin/field-option-settings/helpers/options/options.tpl b/views/templates/admin/field-option-settings/helpers/options/options.tpl
deleted file mode 100755
index 4c100589d..000000000
--- a/views/templates/admin/field-option-settings/helpers/options/options.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-{**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- *}
-
-{extends file="helpers/options/options.tpl"}
-
-{block name="input" append}
-    {if $field['type'] == 'password_input'}
-        <div class="col-lg-5">
-            <input
-                    type="password"
-                    {if isset($field['id'])} id="{$field['id']}"{/if}
-                    class="{if isset($field['class'])}{$field['class']}{/if}"
-                    size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}"
-                    name="{$key}"
-                    value="{$field['value']}"
-                    {if isset($field['autocomplete']) && !$field['autocomplete']} autocomplete="off"{/if} />
-        </div>
-    {/if}
-    {if $field['type'] == 'desc'}
-        <div class="col-lg-5 {if isset($field['class'])}{$field['class']|escape:'htmlall':'UTF-8'}{/if}">
-            {if $field['template'] == 'field-javascript-library-desc.tpl'}
-                {include file="../../../partials/field-javascript-library-desc.tpl"}
-            {/if}
-
-            {if $field['template'] == 'field-access-token-desc.tpl'}
-                {include file="../../../partials/field-access-token-desc.tpl"}
-            {/if}
-
-            {if $field['template'] == 'field-hosted-field-template-desc.tpl'}
-                {include file="../../../partials/field-hosted-field-template-desc.tpl"}
-            {/if}
-            {if $field['template'] == 'field-new-order-mail-desc.tpl'}
-                {include file="../../../partials/field-new-order-mail-desc.tpl"}
-            {/if}
-        </div>
-    {/if}
-
-    {if $field['type'] == 'select-template'}
-
-        <div class="field-container">
-            {foreach from=$field['templateOptions'] key=key item=templateUrl}
-                {assign var='key' value=$key + 1} {* To have normal keys without 0 *}
-                <label class="field-label">
-                    <input type="radio" name="{$field['name']|escape:'htmlall':'UTF-8'}" value="{$key|escape:'htmlall':'UTF-8'}" {if $key == $field['value']}checked{/if}>
-                    <img src="{$templateUrl|escape:'htmlall':'UTF-8'}">
-                </label>
-            {/foreach}
-        </div>
-
-    {/if}
-{/block}
diff --git a/views/templates/admin/field-option-settings/index.php b/views/templates/admin/field-option-settings/index.php
deleted file mode 100755
index ee6227264..000000000
--- a/views/templates/admin/field-option-settings/index.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- *NOTICE OF LICENSE
- *
- *This source file is subject to the Open Software License (OSL 3.0)
- *that is bundled with this package in the file LICENSE.txt.
- *It is also available through the world-wide-web at this URL:
- *http://opensource.org/licenses/osl-3.0.php
- *If you did not receive a copy of the license and are unable to
- *obtain it through the world-wide-web, please send an email
- *to license@prestashop.com so we can send you a copy immediately.
- *
- *DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- *versions in the future. If you wish to customize PrestaShop for your
- *needs please refer to http://www.prestashop.com for more information.
- *
- *@author INVERTUS UAB www.invertus.eu  <support@invertus.eu>
- *@copyright SIX Payment Services
- *@license   SIX Payment Services
- */
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../');
-exit;
diff --git a/views/templates/admin/logs/log_modal.tpl b/views/templates/admin/logs/log_modal.tpl
index 62cb43dd4..eadfc7fcd 100644
--- a/views/templates/admin/logs/log_modal.tpl
+++ b/views/templates/admin/logs/log_modal.tpl
@@ -19,7 +19,8 @@
  *@copyright SIX Payment Services
  *@license   SIX Payment Services
  *}
-<div
+<button
+        type="button"
         class="btn btn-default button js-log-button"
         data-toggle="modal"
         data-log-id="{$log_id|escape:'htmlall':'UTF-8'}"
@@ -27,14 +28,14 @@
         data-target="log-modal-{$log_id|escape:'htmlall':'UTF-8'}-{$log_information_type|escape:'htmlall':'UTF-8'}"
 >
     {l s='View' mod='saferpayofficial'}
-</div>
+</button>
 
-<div id="log-modal-{$log_id|escape:'htmlall':'UTF-8'}-{$log_information_type|escape:'htmlall':'UTF-8'}" class="modal">
+<div id="log-modal-{$log_id|escape:'htmlall':'UTF-8'}-{$log_information_type|escape:'htmlall':'UTF-8'}" class="modal" role="dialog" aria-modal="true" aria-labelledby="log-modal-title-{$log_id|escape:'htmlall':'UTF-8'}-{$log_information_type|escape:'htmlall':'UTF-8'}">
     <div class="log-modal-overlay"></div>
 
     <div class="log-modal-window">
         <div class="log-modal-title">
-            <h4>
+            <h4 id="log-modal-title-{$log_id|escape:'htmlall':'UTF-8'}-{$log_information_type|escape:'htmlall':'UTF-8'}">
                 {if $log_information_type === 'request'}
                     {$log_id|escape:'htmlall':'UTF-8'}: {l s='Request data' mod='saferpayofficial'}
                 {elseif $log_information_type === 'response'}
@@ -43,10 +44,11 @@
                     {$log_id|escape:'htmlall':'UTF-8'}: {l s='Context data' mod='saferpayofficial'}
                 {/if}
             </h4>
+            <button type="button" class="log-modal-close js-log-modal-close" aria-label="{l s='Close' mod='saferpayofficial'}">&times;</button>
         </div>
 
         <div class="log-modal-content">
-            <div class="log-modal-content-spinner hidden"></div>
+            <div class="log-modal-content-spinner hidden" role="status" aria-label="{l s='Loading' mod='saferpayofficial'}"></div>
             <pre class="log-modal-content-data hidden"></pre>
         </div>
     </div>
diff --git a/views/templates/front/credit_card.tpl b/views/templates/front/credit_card.tpl
index f1e29053b..7f0f363fb 100755
--- a/views/templates/front/credit_card.tpl
+++ b/views/templates/front/credit_card.tpl
@@ -22,7 +22,7 @@
 
 <tr>
     <td>
-        <img src="{$card_img|escape:'htmlall':'UTF-8'}">
+        <img src="{$card_img|escape:'htmlall':'UTF-8'}" alt="{$payment_method|escape:'htmlall':'UTF-8'}">
     </td>
     <td>
         {$payment_method|escape:'htmlall':'UTF-8'}
@@ -38,7 +38,8 @@
     </td>
     <td>
         <a class="button lnk_view btn btn-default"
-           href="{$link->getModuleLink('saferpayofficial', {$controller|escape:'htmlall':'UTF-8'}, ['saved_card_id' => $saved_card_id|escape:'htmlall':'UTF-8'])|escape:'htmlall':'UTF-8' }">
+           href="{$link->getModuleLink('saferpayofficial', {$controller|escape:'htmlall':'UTF-8'}, ['saved_card_id' => $saved_card_id|escape:'htmlall':'UTF-8'])|escape:'htmlall':'UTF-8' }"
+           aria-label="{l s='Remove card' mod='saferpayofficial'} {$card_number|escape:'htmlall':'UTF-8'}">
             <span>
                 {l s='Remove' mod='saferpayofficial'}
             </span>
diff --git a/views/templates/front/credit_cards.tpl b/views/templates/front/credit_cards.tpl
index 16083a4b5..66e0c76d6 100755
--- a/views/templates/front/credit_cards.tpl
+++ b/views/templates/front/credit_cards.tpl
@@ -29,30 +29,34 @@
 {block name='page_content'}
     <div class="card">
         <table class="table">
+            <caption class="sr-only">{l s='Saved credit cards' mod='saferpayofficial'}</caption>
             <thead>
             <tr>
-                <th>
+                <th scope="col">
+                    <span class="sr-only">{l s='Card type' mod='saferpayofficial'}</span>
                 </th>
-                <th>
+                <th scope="col">
                     {l s='Credit card' mod='saferpayofficial'}
                 </th>
-                <th>
+                <th scope="col">
                     {l s='Added date' mod='saferpayofficial'}
                 </th>
-                <th>
+                <th scope="col">
                     {l s='Valid till' mod='saferpayofficial'}
                 </th>
-                <th>
-                    {l s='Card' mod='saferpayofficial'}
+                <th scope="col">
+                    {l s='Card number' mod='saferpayofficial'}
                 </th>
-                <th>
+                <th scope="col">
                     {l s='Action' mod='saferpayofficial'}
                 </th>
             </tr>
             </thead>
+            <tbody>
             {foreach $rows as $row}
                 {$row|cleanHtml nofilter}
             {/foreach}
+            </tbody>
         </table>
     </div>
 {/block}
diff --git a/views/templates/front/hosted-templates/partials/all_errors.tpl b/views/templates/front/hosted-templates/partials/all_errors.tpl
index 4b99e0310..2fdddc0a7 100755
--- a/views/templates/front/hosted-templates/partials/all_errors.tpl
+++ b/views/templates/front/hosted-templates/partials/all_errors.tpl
@@ -19,18 +19,18 @@
  *@copyright SIX Payment Services
  *@license   SIX Payment Services
  *}
-<div style="display:none" class="alert alert-danger initialize-error" role="alert">
+<div style="display:none" class="alert alert-danger initialize-error" role="alert" aria-live="assertive">
     {include file="module:saferpayofficial/views/templates/front/hosted-templates/partials/initialize_error.tpl"}
 </div>
 
-<div style="display: none" class="alert alert-danger submission-error" role="alert">
+<div style="display: none" class="alert alert-danger submission-error" role="alert" aria-live="assertive">
     {include file="module:saferpayofficial/views/templates/front/hosted-templates/partials/submission_error.tpl"}
 </div>
 
-<div style="display:none" class="alert alert-danger internal-error" role="alert">
+<div style="display:none" class="alert alert-danger internal-error" role="alert" aria-live="assertive">
     {include file="module:saferpayofficial/views/templates/front/hosted-templates/partials/internal_error.tpl"}
 </div>
 
-<div style="display: none" class="alert alert-danger validation-error" role="alert">
+<div style="display: none" class="alert alert-danger validation-error" role="alert" aria-live="assertive">
     {include file="module:saferpayofficial/views/templates/front/hosted-templates/partials/validation_error.tpl"}
 </div>
\ No newline at end of file
diff --git a/views/templates/front/hosted-templates/partials/all_errors_16.tpl b/views/templates/front/hosted-templates/partials/all_errors_16.tpl
index cf5a5a1f7..40eab9865 100755
--- a/views/templates/front/hosted-templates/partials/all_errors_16.tpl
+++ b/views/templates/front/hosted-templates/partials/all_errors_16.tpl
@@ -19,18 +19,18 @@
  *@copyright SIX Payment Services
  *@license   SIX Payment Services
  *}
-<div style="display:none" class="alert alert-danger initialize-error" role="alert">
+<div style="display:none" class="alert alert-danger initialize-error" role="alert" aria-live="assertive">
     {include file="./initialize_error.tpl"}
 </div>
 
-<div style="display: none" class="alert alert-danger submission-error" role="alert">
+<div style="display: none" class="alert alert-danger submission-error" role="alert" aria-live="assertive">
     {include file="./submission_error.tpl"}
 </div>
 
-<div style="display:none" class="alert alert-danger internal-error" role="alert">
+<div style="display:none" class="alert alert-danger internal-error" role="alert" aria-live="assertive">
     {include file="./internal_error.tpl"}
 </div>
 
-<div style="display: none" class="alert alert-danger validation-error" role="alert">
+<div style="display: none" class="alert alert-danger validation-error" role="alert" aria-live="assertive">
     {include file="./validation_error.tpl"}
 </div>
\ No newline at end of file
diff --git a/views/templates/front/hosted-templates/template1.tpl b/views/templates/front/hosted-templates/template1.tpl
index 7e472882b..503132ae3 100755
--- a/views/templates/front/hosted-templates/template1.tpl
+++ b/views/templates/front/hosted-templates/template1.tpl
@@ -34,21 +34,25 @@
 
     <div class="container" id="main">
         <div class="form-group">
-            <input class="form-control" id="fields-holder-name" readonly placeholder="{l s='Holder name' mod='saferpayofficial'}">
+            <label for="fields-holder-name" class="sr-only">{l s='Holder name' mod='saferpayofficial'}</label>
+            <input class="form-control" id="fields-holder-name" readonly placeholder="{l s='Holder name' mod='saferpayofficial'}" aria-label="{l s='Holder name' mod='saferpayofficial'}">
         </div>
 
         <div class="form-group row">
             <div class="col-sm-12">
-                <input class="form-control" id="fields-card-number" readonly placeholder="{l s='0000 0000 0000 0000' mod='saferpayofficial'}">
+                <label for="fields-card-number" class="sr-only">{l s='Card number' mod='saferpayofficial'}</label>
+                <input class="form-control" id="fields-card-number" readonly placeholder="{l s='0000 0000 0000 0000' mod='saferpayofficial'}" aria-label="{l s='Card number' mod='saferpayofficial'}">
             </div>
         </div>
 
         <div class="row">
             <div class="col-sm-6 col-xs-12 form-group">
-                <input class="form-control" id="fields-expiration" readonly placeholder="{l s='MM/YYYY' mod='saferpayofficial'}">
+                <label for="fields-expiration" class="sr-only">{l s='Expiration date' mod='saferpayofficial'}</label>
+                <input class="form-control" id="fields-expiration" readonly placeholder="{l s='MM/YYYY' mod='saferpayofficial'}" aria-label="{l s='Expiration date' mod='saferpayofficial'}">
             </div>
             <div class="col-sm-6 col-xs-12 form-group">
-                <input class="form-control" id="fields-cvc" readonly placeholder="{l s='000' mod='saferpayofficial'}">
+                <label for="fields-cvc" class="sr-only">{l s='CVC code' mod='saferpayofficial'}</label>
+                <input class="form-control" id="fields-cvc" readonly placeholder="{l s='000' mod='saferpayofficial'}" aria-label="{l s='CVC code' mod='saferpayofficial'}">
             </div>
         </div>
 
@@ -67,21 +71,25 @@
 
     <div class="container" id="main">
         <div class="form-group">
-            <input class="form-control" id="fields-holder-name" readonly placeholder="{l s='Holder name' mod='saferpayofficial'}">
+            <label for="fields-holder-name" class="sr-only">{l s='Holder name' mod='saferpayofficial'}</label>
+            <input class="form-control" id="fields-holder-name" readonly placeholder="{l s='Holder name' mod='saferpayofficial'}" aria-label="{l s='Holder name' mod='saferpayofficial'}">
         </div>
 
         <div class="form-group row">
             <div class="col-sm-12">
-                <input class="form-control" id="fields-card-number" readonly placeholder="{l s='0000 0000 0000 0000' mod='saferpayofficial'}">
+                <label for="fields-card-number" class="sr-only">{l s='Card number' mod='saferpayofficial'}</label>
+                <input class="form-control" id="fields-card-number" readonly placeholder="{l s='0000 0000 0000 0000' mod='saferpayofficial'}" aria-label="{l s='Card number' mod='saferpayofficial'}">
             </div>
         </div>
 
         <div class="row">
             <div class="col-sm-6 col-xs-12 form-group">
-                <input class="form-control" id="fields-expiration" readonly placeholder="{l s='MM/YYYY' mod='saferpayofficial'}">
+                <label for="fields-expiration" class="sr-only">{l s='Expiration date' mod='saferpayofficial'}</label>
+                <input class="form-control" id="fields-expiration" readonly placeholder="{l s='MM/YYYY' mod='saferpayofficial'}" aria-label="{l s='Expiration date' mod='saferpayofficial'}">
             </div>
             <div class="col-sm-6 col-xs-12 form-group">
-                <input class="form-control" id="fields-cvc" readonly placeholder="{l s='000' mod='saferpayofficial'}">
+                <label for="fields-cvc" class="sr-only">{l s='CVC code' mod='saferpayofficial'}</label>
+                <input class="form-control" id="fields-cvc" readonly placeholder="{l s='000' mod='saferpayofficial'}" aria-label="{l s='CVC code' mod='saferpayofficial'}">
             </div>
         </div>
 
diff --git a/views/templates/front/hosted-templates/template3.tpl b/views/templates/front/hosted-templates/template3.tpl
index 5dbc50b77..cfd9375b8 100755
--- a/views/templates/front/hosted-templates/template3.tpl
+++ b/views/templates/front/hosted-templates/template3.tpl
@@ -39,18 +39,21 @@
             <div class="input-container">
                 <div class="form-group row col-sm-7 input-box">
                     <div class="col col-sm-12 col-md-6">
-                        <input type="input" class="saferpay-input form-control" id="fields-card-number""
-                        placeholder="{l s='Card number' mod='saferpayofficial'}" readonly>
+                        <label for="fields-card-number" class="sr-only">{l s='Card number' mod='saferpayofficial'}</label>
+                        <input type="input" class="saferpay-input form-control" id="fields-card-number"
+                        placeholder="{l s='Card number' mod='saferpayofficial'}" aria-label="{l s='Card number' mod='saferpayofficial'}" readonly>
                     </div>
 
                     <div class="col col-sm-12 col-md-3">
+                        <label for="fields-expiration" class="sr-only">{l s='Expiration date' mod='saferpayofficial'}</label>
                         <input type="input" class="saferpay-input form-control" id="fields-expiration"
-                               placeholder="{l s='Exp' mod='saferpayofficial'}" readonly>
+                               placeholder="{l s='Exp' mod='saferpayofficial'}" aria-label="{l s='Expiration date' mod='saferpayofficial'}" readonly>
                     </div>
 
                     <div class="col col-sm-12 col-md-3">
+                        <label for="fields-cvc" class="sr-only">{l s='CVC code' mod='saferpayofficial'}</label>
                         <input type="input" class="saferpay-input form-control" id="fields-cvc"
-                               placeholder="{l s='Cvc' mod='saferpayofficial'}" readonly>
+                               placeholder="{l s='Cvc' mod='saferpayofficial'}" aria-label="{l s='CVC code' mod='saferpayofficial'}" readonly>
                     </div>
                 </div>
             </div>
@@ -64,7 +67,7 @@
 
             <div class="credit-card-container">
                 <div class="image-container">
-                    <div id="credit-card" class="credit-card-image img-fluid"></div>
+                    <div id="credit-card" class="credit-card-image img-fluid" role="img" aria-label="{l s='Credit card preview' mod='saferpayofficial'}"></div>
                 </div>
             </div>
 
@@ -85,18 +88,21 @@
             <div class="input-container">
                 <div class="form-group row col-sm-7 input-box">
                     <div class="col col-sm-12 col-md-6">
-                        <input type="input" class="saferpay-input form-control" id="fields-card-number""
-                        placeholder="{l s='Card number' mod='saferpayofficial'}" readonly>
+                        <label for="fields-card-number" class="sr-only">{l s='Card number' mod='saferpayofficial'}</label>
+                        <input type="input" class="saferpay-input form-control" id="fields-card-number"
+                        placeholder="{l s='Card number' mod='saferpayofficial'}" aria-label="{l s='Card number' mod='saferpayofficial'}" readonly>
                     </div>
 
                     <div class="col col-sm-12 col-md-3">
+                        <label for="fields-expiration" class="sr-only">{l s='Expiration date' mod='saferpayofficial'}</label>
                         <input type="input" class="saferpay-input form-control" id="fields-expiration"
-                               placeholder="{l s='Exp' mod='saferpayofficial'}" readonly>
+                               placeholder="{l s='Exp' mod='saferpayofficial'}" aria-label="{l s='Expiration date' mod='saferpayofficial'}" readonly>
                     </div>
 
                     <div class="col col-sm-12 col-md-3">
+                        <label for="fields-cvc" class="sr-only">{l s='CVC code' mod='saferpayofficial'}</label>
                         <input type="input" class="saferpay-input form-control" id="fields-cvc"
-                               placeholder="{l s='Cvc' mod='saferpayofficial'}" readonly>
+                               placeholder="{l s='Cvc' mod='saferpayofficial'}" aria-label="{l s='CVC code' mod='saferpayofficial'}" readonly>
                     </div>
                 </div>
             </div>
@@ -110,7 +116,7 @@
 
             <div class="credit-card-container">
                 <div class="image-container">
-                    <div id="credit-card" class="credit-card-image img-fluid"></div>
+                    <div id="credit-card" class="credit-card-image img-fluid" role="img" aria-label="{l s='Credit card preview' mod='saferpayofficial'}"></div>
                 </div>
             </div>
 
diff --git a/views/templates/front/loading.tpl b/views/templates/front/loading.tpl
index 07fbe8d47..242413ed0 100755
--- a/views/templates/front/loading.tpl
+++ b/views/templates/front/loading.tpl
@@ -26,7 +26,9 @@
 {/block}
 
 {block name='content'}
-    <div class="loader"></div>
+    <div class="loader" role="status" aria-live="polite">
+        <span class="sr-only">{l s='Loading payment, please wait' mod='saferpayofficial'}</span>
+    </div>
 {/block}
 
 {block name='footer'}
diff --git a/views/templates/front/saferpay_iframe.tpl b/views/templates/front/saferpay_iframe.tpl
index 6056c0345..7180a76c2 100755
--- a/views/templates/front/saferpay_iframe.tpl
+++ b/views/templates/front/saferpay_iframe.tpl
@@ -30,13 +30,13 @@
 
 {block name='content'}
     <div>
-        <iframe id="saferpay-iframe" src="{$redirect|escape:'htmlall':'UTF-8'}"></iframe>
+        <iframe id="saferpay-iframe" src="{$redirect|escape:'htmlall':'UTF-8'}" title="{l s='Saferpay payment form' mod='saferpayofficial'}"></iframe>
     </div>
 {/block}
 
 {block name='checkout_process'}
     <div>
-        <iframe id="saferpay-iframe" src="{$redirect|escape:'htmlall':'UTF-8'}"></iframe>
+        <iframe id="saferpay-iframe" src="{$redirect|escape:'htmlall':'UTF-8'}" title="{l s='Saferpay payment form' mod='saferpayofficial'}"></iframe>
     </div>
 {/block}
 
diff --git a/views/templates/front/saferpay_wait.tpl b/views/templates/front/saferpay_wait.tpl
index 28d372572..37f75b5d0 100644
--- a/views/templates/front/saferpay_wait.tpl
+++ b/views/templates/front/saferpay_wait.tpl
@@ -20,7 +20,8 @@
  *@license   SIX Payment Services
  *}
 <h2>{l s='Awaiting payment status' mod='saferpayofficial'}</h2>
-<div class="saferpay-spinner">
+<div class="saferpay-spinner" role="status" aria-live="polite">
+    <span class="sr-only">{l s='Loading, please wait' mod='saferpayofficial'}</span>
     <div class="rect1"></div>
     <div class="rect2"></div>
     <div class="rect3"></div>
@@ -98,7 +99,11 @@
                 try {
                     var data = JSON.parse(request.responseText);
                     if (data.isFinished && data.href) {
-                        window.location.href = data.href;
+                        try {
+                            (window.top || window).location.replace(data.href);
+                        } catch (e) {
+                            window.location.replace(data.href);
+                        }
                         return;
                     }
                 } catch (e) {
diff --git a/views/templates/hook/admin/saferpay_order.tpl b/views/templates/hook/admin/saferpay_order.tpl
index fff4f2b2e..7ad4012ab 100755
--- a/views/templates/hook/admin/saferpay_order.tpl
+++ b/views/templates/hook/admin/saferpay_order.tpl
@@ -37,10 +37,13 @@
                     <div class="mb-2 form-inline">
                         <div class="input-group money-type row">
                             <div class="input-group">
+                                <label for="saferpay-refund-amount" class="sr-only">{l s='Refund amount' mod='saferpayofficial'}</label>
                                 <span class=" input-group-addon input-group-text"> {$currencySign|escape:'htmlall':'UTF-8'}</span>
                                 <input type="number"
+                                       id="saferpay-refund-amount"
                                        name="saferpay_refund_amount"
                                        class="form-control"
+                                       aria-label="{l s='Refund amount' mod='saferpayofficial'}"
                                        step=".01"
                                        min="0"
                                        max="{($authAmount|escape:'htmlall':'UTF-8' - $refund_amount|escape:'htmlall':'UTF-8' - $pending_refund_amount|escape:'htmlall':'UTF-8') / $amountMultiplier|escape:'htmlall':'UTF-8'}"
diff --git a/views/templates/hook/front/payment_with_cards.tpl b/views/templates/hook/front/payment_with_cards.tpl
index 5ec47b52b..d5dc48a9c 100755
--- a/views/templates/hook/front/payment_with_cards.tpl
+++ b/views/templates/hook/front/payment_with_cards.tpl
@@ -36,8 +36,8 @@
         <input type="hidden" class="saved_card_method" name="isBusinessLicence" value="1">
         <input type="hidden" name="saferpayPaymentType" value="{$saferpayPaymentType|escape:'htmlall':'UTF-8'}">
 
-        <a type="submit" class="btn btn-default button button-medium" onclick="$(this).closest('form').submit();">
+        <button type="submit" class="btn btn-default button button-medium">
             <span>{l s='Pay' mod='saferpayofficial'}<i class="icon-chevron-right right"></i></span>
-        </a>
+        </button>
     </form>
 </div>
diff --git a/views/templates/hook/front/saferpay_additional_info.tpl b/views/templates/hook/front/saferpay_additional_info.tpl
index 66b9b9e1d..ad441659c 100755
--- a/views/templates/hook/front/saferpay_additional_info.tpl
+++ b/views/templates/hook/front/saferpay_additional_info.tpl
@@ -25,20 +25,26 @@
     {$selected = 1}
     {foreach $savedCards as $savedCard}
         <div class="saved_credit_cards">
-            <input type="radio" name="saved_card_{$paymentMethod|escape:'htmlall':'UTF-8'}" value="{$savedCard['id_saferpay_card_alias']|escape:'htmlall':'UTF-8'}"
-                   {if $selected }checked="checked" {$selected = 0}{/if}
-            >
-            <span>{$savedCard['card_number']|escape:'htmlall':'UTF-8'}</span>
+            <label>
+                <input type="radio" name="saved_card_{$paymentMethod|escape:'htmlall':'UTF-8'}" value="{$savedCard['id_saferpay_card_alias']|escape:'htmlall':'UTF-8'}"
+                       {if $selected }checked="checked" {$selected = 0}{/if}
+                >
+                <span>{$savedCard['card_number']|escape:'htmlall':'UTF-8'}</span>
+            </label>
         </div>
     {/foreach}
     <div class="saved_credit_cards">
-        <input type="radio" name="saved_card_{$paymentMethod|escape:'htmlall':'UTF-8'}" value="0"
-               {if $selected }checked="checked"{/if}
-        >
-        <span>{l s='Use new card and save it' mod='saferpayofficial'}</span>
+        <label>
+            <input type="radio" name="saved_card_{$paymentMethod|escape:'htmlall':'UTF-8'}" value="0"
+                   {if $selected }checked="checked"{/if}
+            >
+            <span>{l s='Use new card and save it' mod='saferpayofficial'}</span>
+        </label>
     </div>
     <div class="saved_credit_cards">
-        <input type="radio" name="saved_card_{$paymentMethod|escape:'htmlall':'UTF-8'}" value="-1">
-        <span>{l s='Use new card once' mod='saferpayofficial'}</span>
+        <label>
+            <input type="radio" name="saved_card_{$paymentMethod|escape:'htmlall':'UTF-8'}" value="-1">
+            <span>{l s='Use new card once' mod='saferpayofficial'}</span>
+        </label>
     </div>
 </div>
\ No newline at end of file
diff --git a/views/templates/hook/front/saferpay_payment.tpl b/views/templates/hook/front/saferpay_payment.tpl
index 4151f6245..d0c7c2697 100755
--- a/views/templates/hook/front/saferpay_payment.tpl
+++ b/views/templates/hook/front/saferpay_payment.tpl
@@ -21,5 +21,5 @@
  *}
 
 <div>
-    <iframe id="test-frame" src=''></iframe>
+    <iframe id="saferpay-payment-frame" src='' title="{l s='Saferpay payment form' mod='saferpayofficial'}"></iframe>
 </div>
\ No newline at end of file