diff --git a/composer.json b/composer.json
index 0a661f6c0..db97c34c8 100644
--- a/composer.json
+++ b/composer.json
@@ -73,6 +73,6 @@
         "rapidez/reviews": "<4.1"
     },
     "scripts": {
-        "analyse": "phpstan --memory-limit=256M"
+        "analyse": "phpstan --memory-limit=512M"
     }
 }
diff --git a/resources/js/components/Checkout/CheckoutLogin.vue b/resources/js/components/Checkout/CheckoutLogin.vue
index 3df17648d..c58416423 100644
--- a/resources/js/components/Checkout/CheckoutLogin.vue
+++ b/resources/js/components/Checkout/CheckoutLogin.vue
@@ -1,4 +1,5 @@
 <script>
+import { SessionExpired } from '../../fetch'
 import { cart, setGuestEmailOnCart } from '../../stores/useCart'
 import { isEmailAvailable, login, register, user } from '../../stores/useUser'
 import { useDebounceFn } from '@vueuse/core'
@@ -70,7 +71,15 @@ export default {
         async handleLogin() {
             return await login(this.email, this.password)
                 .then(() => true)
-                .catch((error) => {
+                .catch(async (error) => {
+                    if (error instanceof SessionExpired) {
+                        let data = await error.response.json()
+                        if (data?.errors?.[0]?.message) {
+                            Notify(data.errors[0].message, 'error')
+                            return false
+                        }
+                    }
+
                     if (error.message) {
                         Notify(error.message, 'error')
                     }
diff --git a/resources/js/stores/useUser.js b/resources/js/stores/useUser.js
index d49109925..6f8296f53 100644
--- a/resources/js/stores/useUser.js
+++ b/resources/js/stores/useUser.js
@@ -136,6 +136,7 @@ export const login = async function (email, password) {
         },
         {
             notifyOnError: false,
+            redirectOnExpiration: false,
         },
     ).then(async (response) => {
         await loginByToken(response.data.generateCustomerToken.token)
diff --git a/resources/views/components/notifications.blade.php b/resources/views/components/notifications.blade.php
index 89bf87bfe..2ea9b6817 100644
--- a/resources/views/components/notifications.blade.php
+++ b/resources/views/components/notifications.blade.php
@@ -1,5 +1,5 @@
 <notifications v-cloak>
-    <div class="fixed sm:max-w-sm sm:w-full top-6 right-6 left-6 sm:left-auto flex flex-col z-notifications" slot-scope="{ notifications }">
+    <div class="fixed sm:max-w-sm sm:w-full top-6 right-6 left-6 sm:left-auto flex flex-col z-notifications" data-testid="notifications" slot-scope="{ notifications }">
         <notification v-if="notifications.length" v-for="(notification, index) in notifications" :notification="notification" :key="index +1">
             <transition
                 enter-active-class="ease-in-out duration-500"
diff --git a/tests/playwright/checkout.spec.js b/tests/playwright/checkout.spec.js
index 1c686e06e..d546f0984 100644
--- a/tests/playwright/checkout.spec.js
+++ b/tests/playwright/checkout.spec.js
@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test'
 import { BasePage } from './pages/BasePage'
 import { ProductPage } from './pages/ProductPage'
-import { CheckoutPage } from './pages/CheckoutPage'
+import { CheckoutPage, screenshot_login, screenshot_credentials, screenshot_payment, screenshot_success } from './pages/CheckoutPage'
 import { AccountPage } from './pages/AccountPage'
 
 const checkoutTypes = ['default', 'onestep']
@@ -9,20 +9,20 @@ const checkoutTypes = ['default', 'onestep']
 checkoutTypes.forEach((type) => {
     test(type + ' - as guest', BasePage.tags, async ({ page }) => {
         const productPage = new ProductPage(page)
-        const checkoutPage = new CheckoutPage(page, type)
+        const checkoutPage = new CheckoutPage(page, type, [
+            screenshot_login,
+            screenshot_credentials,
+            screenshot_payment,
+            screenshot_success,
+        ])
 
         await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
-        await checkoutPage.checkout(`wayne+${crypto.randomUUID()}@enterprises.com`, false, false, [
-            'login',
-            'credentials',
-            'payment',
-            'success',
-        ])
+        await checkoutPage.checkout(`wayne+${crypto.randomUUID()}@enterprises.com`, false, false)
     })
 
     test(type + ' - as user', BasePage.tags, async ({ page }) => {
         const productPage = new ProductPage(page)
-        const checkoutPage = new CheckoutPage(page, type)
+        const checkoutPage = new CheckoutPage(page, type, [screenshot_login, screenshot_credentials])
         const accountPage = new AccountPage(page)
 
         const email = `wayne+${crypto.randomUUID()}@enterprises.com`
@@ -30,12 +30,42 @@ checkoutTypes.forEach((type) => {
 
         // Register
         await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
-        await checkoutPage.checkout(email, password, true, ['credentials'])
+        await checkoutPage.checkout(email, password, true)
 
         await accountPage.logout()
 
+        checkoutPage.screenshots = []
         // Login
         await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
         await checkoutPage.checkout(email, password)
     })
 })
+
+test('incorrect password login', BasePage.tags, async ({ page }) => {
+    const productPage = new ProductPage(page)
+    const checkoutPage = new CheckoutPage(page, 'default', [screenshot_credentials])
+    const accountPage = new AccountPage(page)
+
+    const email = `wayne+${crypto.randomUUID()}@enterprises.com`
+    const password = 'IronManSucks.91939'
+
+    // Register
+    await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
+    await checkoutPage.checkout(email, password, true)
+
+    await accountPage.logout()
+
+    checkoutPage.screenshots = []
+    // Login
+    await productPage.addToCart(process.env.PRODUCT_URL_SIMPLE)
+    await checkoutPage.gotoCheckout()
+    await checkoutPage.login(email, password + '!')
+    await page.getByTestId('continue').click()
+    await page.waitForTimeout(500)
+    await page.waitForLoadState('networkidle')
+    await expect(page.getByTestId('notifications')).toContainText(
+        'The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later.',
+    )
+
+    await checkoutPage.checkout(email, password)
+})
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
index 0a344f6d9..8a7a00343 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c19b9fd29a1b5cbfd5c3ae50ede6a5ff6ca007635513db9968397f2b28a9c1fb
-size 21312
+oid sha256:3bb1e6f015d787629315c5a0223953605c6df4057ad770bdfcaea21696ce15e0
+size 11083
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
index 9a8f27b5b..11a62d5ec 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0eea030eca2cf44d60089de7375337df9d4c35a0e8ae0a08ee4f39a2f0fd23b4
-size 24584
+oid sha256:ee77a13eca2300ab9074f3273adb09f8301ed865cc0c398c9383f83a751517fc
+size 12919
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
index 4e9dc2c18..0c2e89232 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32af78ee6b84531403c54f94bb8bc4d765ab073a94e1210491b616c77b0f739c
-size 31932
+oid sha256:abe1e7ee52b70ae4a7b7a13ea2ac2d78c949f8b1dc494186b55e97ce19e37d35
+size 21017
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
index 1241dd18e..9b901fa4a 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:526080b52a5e53462f216311f57f8d94d2292e35959a407c338bb8239ce709d9
-size 56469
+oid sha256:9a471d1ff8b57317d1518c3592df7e86659f39be7c92e1a5e29bd6bbb3693ab0
+size 38198
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
index 0b36557da..9bcaad930 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d10af73c2096f94ba9c3c7a3774aaf861dee0244e2808861f2757ffeaf640c8d
-size 37603
+oid sha256:745ae4372c1e33e70a31890cfe682898da1d59c5b7ff0313ec9844d3b71121b0
+size 24265
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png
index 413b506f6..d65179577 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f2eb089bf4b9dd1c3f274b10767d277677071320538f5f2d1a226ac62ab116f
-size 65047
+oid sha256:dd99e46388b3b3fe1e57625818ecf5ceaae9ee136ca0245ea44e993dba13fd70
+size 21320
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png
index 17e638068..9a8f27b5b 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cfabf456a9a8788a9f400ca88b1b85a19d31be009449d8fc40e6d77a5c92deb
-size 73116
+oid sha256:0eea030eca2cf44d60089de7375337df9d4c35a0e8ae0a08ee4f39a2f0fd23b4
+size 24584
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png
index c66ea2bc6..df7032dd5 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc516eee64744899f039f0ae3cf88eff834e35769eff4e48efda1ecb1b307347
-size 70819
+oid sha256:eccb8f6b48485652acac571c8c77d687cf52e1afafdb32660d749a946e907d4f
+size 31939
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png
index 02c13ef66..ae8e8e124 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec0abc5dc5abff3e2808309ed25c35a1c9e7eb26f97c889c74fd40123fa32beb
-size 112784
+oid sha256:83af4e4019d145a18a67cb724d22045638468149a38737c11a8bb8e08bac587a
+size 56457
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png
index 6876b0717..0b36557da 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-2-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d6cfefdb156878f48d06a0063a02e91b636c631b5aa1801a55d1462d168a7ac
-size 84519
+oid sha256:d10af73c2096f94ba9c3c7a3774aaf861dee0244e2808861f2757ffeaf640c8d
+size 37603
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Chrome-linux.png
index 24be2c5b9..f0cbe3e4f 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30a61b6f183a00f7b674f9ed9a8166d92b25831444896791c2df39ebc7c95375
-size 13162
+oid sha256:d04b1102b7653683d9945c73b2314d1f4b4d6d2e5118ef8372025e822c05ad80
+size 65057
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Safari-linux.png
index 196e878ef..17e638068 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c6e77e2364c100228ed62e4f90b02022aa2f8d0b9ca04a3acda643586867e57
-size 15696
+oid sha256:7cfabf456a9a8788a9f400ca88b1b85a19d31be009449d8fc40e6d77a5c92deb
+size 73116
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-chromium-linux.png
index 62e9e7f99..a048a47d9 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0bba081b5eccb1ed271cc6936da7875ebf25293fcb33b86b57e1d6c1394a378
-size 23300
+oid sha256:360f61e324941de5af649e8b78e193ae121797c4b638f435076f1ac2cff6a861
+size 70825
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-firefox-linux.png
index 692505f64..3b03aaa55 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eea408513f7a0fb7fffd37f9eb92382e7a8ab969cc9a161be4ab1e170b1b3f7
-size 41526
+oid sha256:ebcda910651aa0947bc0b93fe9538e196b607044090f8441574cc2d6e13dc874
+size 112768
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-webkit-linux.png
index 8409503ae..6876b0717 100644
--- a/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/default---as-user-3-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:777de5d31b98fb0b431b1b629503eb20c72bf14cba2cba19ad448006b365225f
-size 27203
+oid sha256:4d6cfefdb156878f48d06a0063a02e91b636c631b5aa1801a55d1462d168a7ac
+size 84519
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-Mobile-Chrome-linux.png
new file mode 100644
index 000000000..f0cbe3e4f
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-Mobile-Chrome-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d04b1102b7653683d9945c73b2314d1f4b4d6d2e5118ef8372025e822c05ad80
+size 65057
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-Mobile-Safari-linux.png
new file mode 100644
index 000000000..17e638068
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-Mobile-Safari-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7cfabf456a9a8788a9f400ca88b1b85a19d31be009449d8fc40e6d77a5c92deb
+size 73116
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-chromium-linux.png
new file mode 100644
index 000000000..a048a47d9
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:360f61e324941de5af649e8b78e193ae121797c4b638f435076f1ac2cff6a861
+size 70825
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-firefox-linux.png
new file mode 100644
index 000000000..3b03aaa55
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-firefox-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebcda910651aa0947bc0b93fe9538e196b607044090f8441574cc2d6e13dc874
+size 112768
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-webkit-linux.png
new file mode 100644
index 000000000..6876b0717
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-1-webkit-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d6cfefdb156878f48d06a0063a02e91b636c631b5aa1801a55d1462d168a7ac
+size 84519
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-Mobile-Chrome-linux.png
new file mode 100644
index 000000000..413b506f6
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-Mobile-Chrome-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f2eb089bf4b9dd1c3f274b10767d277677071320538f5f2d1a226ac62ab116f
+size 65047
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-Mobile-Safari-linux.png
new file mode 100644
index 000000000..17e638068
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-Mobile-Safari-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7cfabf456a9a8788a9f400ca88b1b85a19d31be009449d8fc40e6d77a5c92deb
+size 73116
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-chromium-linux.png
new file mode 100644
index 000000000..c66ea2bc6
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc516eee64744899f039f0ae3cf88eff834e35769eff4e48efda1ecb1b307347
+size 70819
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-firefox-linux.png
new file mode 100644
index 000000000..3b03aaa55
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-firefox-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebcda910651aa0947bc0b93fe9538e196b607044090f8441574cc2d6e13dc874
+size 112768
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-webkit-linux.png
new file mode 100644
index 000000000..6876b0717
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-2-webkit-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d6cfefdb156878f48d06a0063a02e91b636c631b5aa1801a55d1462d168a7ac
+size 84519
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-Mobile-Chrome-linux.png
new file mode 100644
index 000000000..24be2c5b9
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-Mobile-Chrome-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30a61b6f183a00f7b674f9ed9a8166d92b25831444896791c2df39ebc7c95375
+size 13162
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-Mobile-Safari-linux.png
new file mode 100644
index 000000000..196e878ef
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-Mobile-Safari-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c6e77e2364c100228ed62e4f90b02022aa2f8d0b9ca04a3acda643586867e57
+size 15696
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-chromium-linux.png
new file mode 100644
index 000000000..62e9e7f99
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-chromium-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0bba081b5eccb1ed271cc6936da7875ebf25293fcb33b86b57e1d6c1394a378
+size 23300
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-firefox-linux.png
new file mode 100644
index 000000000..eb65ab775
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-firefox-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02fdccf1c726b0eadebfee352b088780a1d0517eac915f9bd3de9d3a55513bee
+size 41513
diff --git a/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-webkit-linux.png
new file mode 100644
index 000000000..8409503ae
--- /dev/null
+++ b/tests/playwright/checkout.spec.js-snapshots/incorrect-password-login-3-webkit-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:777de5d31b98fb0b431b1b629503eb20c72bf14cba2cba19ad448006b365225f
+size 27203
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
index a21003374..555a94c6f 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b6c09972465ab9bfe7a4211dc139aea995d82a699ef44b4ce4e7f71161f4ee4
-size 82686
+oid sha256:818f6ddd273e56f2edaec6612840db70e743b26dc3d167c5d0226bf777ac5e48
+size 72062
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
index 1d917d4d6..b446d2895 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f115ac7059ffb65488045035bd5a3f9df442502adee67760438f303cd970ab4
-size 92791
+oid sha256:ea0a90f9c364132fe42234a30ec1896d1424c755f8e3e3c68eee96534fda3b30
+size 80543
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
index 4f2182e5d..82190caf7 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c369f9065cea3ee150821f9c289df6b5a91ad993d29ba4db897d2e0736a017e
-size 80011
+oid sha256:beae84589817c86c6a7fe74c07a19272997b06bf2220c17df39c04ee4dd56a27
+size 68523
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
index 8da62804e..c7f83d1d3 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31e5918fab8e3b7a789098a966e9e3760da1f5972acf2fb2cf45e9f02dbaaf52
-size 129548
+oid sha256:81147ca16ef638f27a5e836a8c3f1cee8c7906ad305627b905ae18010b8b505e
+size 107133
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
index b9835dc1b..114dd3960 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-1-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:627e0693fd0ef4681b4ffe9adccf10f5eda40c8570e8ff9b430f9cea9025bcb6
-size 95601
+oid sha256:53efb300ac1e8f1ef4419097e4a0df2a343d52027d19d12fd1be7cc031d4ef37
+size 80607
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Chrome-linux.png
index ad905b131..053e286dd 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Chrome-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b20cf55532d9b6841a3124da767d28f228fd1a5cab28d3bad03bcbd0148c6f0
-size 73356
+oid sha256:1c656e40023096c3681169a1a9481e95b15775514f509f4b11a8a44f22ec7002
+size 82695
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Safari-linux.png
index 31b529c3a..1d917d4d6 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Safari-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7d94d8c1be49ca175f116821f6279d15d0674c2840629cda13c8387f0696ed2
-size 83607
+oid sha256:8f115ac7059ffb65488045035bd5a3f9df442502adee67760438f303cd970ab4
+size 92791
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-chromium-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-chromium-linux.png
index 0bf452e8d..8d4ab4d98 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-chromium-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-chromium-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a3603a5add4aa1f6dc90b07beb711886517488ca8df214e36bd19d229526929
-size 69372
+oid sha256:6a8390d07c8c0bfa07018410d716bfce5273e83f0d71464123aedcc1f3d17c7a
+size 80031
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-firefox-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-firefox-linux.png
index 39169e364..41413abf9 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-firefox-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-firefox-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8c08523a8d19ab1134212e6db0e374f2bcabe4f32d0cee57c064b9752d87e14
-size 113829
+oid sha256:d29356122305b817a9d846d69ec0b5d106dda65ceae0a1934bd25d525a26d7f9
+size 129526
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-webkit-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-webkit-linux.png
index bc14f1560..b9835dc1b 100644
--- a/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-webkit-linux.png
+++ b/tests/playwright/checkout.spec.js-snapshots/onestep---as-user-2-webkit-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbd9e491e5cf3850b4d3d7c05658dd5714a115573619d033ba85301bdda059db
-size 84771
+oid sha256:627e0693fd0ef4681b4ffe9adccf10f5eda40c8570e8ff9b430f9cea9025bcb6
+size 95601
diff --git a/tests/playwright/pages/CheckoutPage.js b/tests/playwright/pages/CheckoutPage.js
index 25e807ec3..b6d57c8a1 100644
--- a/tests/playwright/pages/CheckoutPage.js
+++ b/tests/playwright/pages/CheckoutPage.js
@@ -1,10 +1,15 @@
 import { expect } from '@playwright/test'
 import { BasePage } from './BasePage'
 
+export const screenshot_login = 'login'
+export const screenshot_credentials = 'credentials'
+export const screenshot_payment = 'payment'
+export const screenshot_success = 'success'
 export class CheckoutPage {
-    constructor(page, type = 'default') {
+    constructor(page, type = 'default', screenshots = []) {
         this.page = page
         this.type = type
+        this.screenshots = screenshots
     }
 
     async gotoCheckout() {
@@ -14,17 +19,22 @@ export class CheckoutPage {
     }
 
     async login(email, password = false, register = false) {
+        await this.page.waitForLoadState('networkidle')
         await this.page.fill('[name=email]', email)
         await this.page.waitForLoadState('networkidle')
 
         if (password && !register) {
-            await new BasePage(this.page).screenshot('fullpage')
+            if (this.screenshots.includes(screenshot_login)) {
+                await new BasePage(this.page).screenshot('fullpage')
+            }
             await this.page.fill('[name=password]', password)
         }
 
         if (password && register) {
             await this.page.getByTestId('create-account').click()
-            await new BasePage(this.page).screenshot('fullpage')
+            if (this.screenshots.includes(screenshot_login)) {
+                await new BasePage(this.page).screenshot('fullpage')
+            }
             await this.page.fill('[name=password]', password)
             await this.page.fill('[name=password_repeat]', password)
             await this.page.fill('[name=firstname]', 'Bruce')
@@ -91,16 +101,16 @@ export class CheckoutPage {
         await this.page.getByTestId('continue').waitFor({ state: 'visible' })
     }
 
-    async checkout(email, password = false, register = false, screenshots = []) {
+    async checkout(email, password = false, register = false) {
         const method = this.type === 'onestep' ? 'checkoutOnestep' : 'checkoutDefault'
 
-        await this[method](email, password, register, screenshots)
+        await this[method](email, password, register)
     }
 
-    async checkoutDefault(email = false, password = false, register = false, screenshots = []) {
+    async checkoutDefault(email = false, password = false, register = false) {
         await this.gotoCheckout()
 
-        if (screenshots.includes('login')) {
+        if (this.screenshots.includes(screenshot_login)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -109,7 +119,7 @@ export class CheckoutPage {
             await this.continue('credentials')
         }
 
-        if (screenshots.includes('credentials')) {
+        if (this.screenshots.includes(screenshot_credentials)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -117,7 +127,7 @@ export class CheckoutPage {
         await this.shippingMethod()
         await this.continue('payment')
 
-        if (screenshots.includes('payment')) {
+        if (this.screenshots.includes(screenshot_payment)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -125,15 +135,15 @@ export class CheckoutPage {
         await this.continue('success')
         await this.success()
 
-        if (screenshots.includes('success')) {
+        if (this.screenshots.includes(screenshot_success)) {
             await new BasePage(this.page).screenshot('fullpage-footer')
         }
     }
 
-    async checkoutOnestep(email = false, password = false, register = false, screenshots = []) {
+    async checkoutOnestep(email = false, password = false, register = false) {
         await this.gotoCheckout()
 
-        if (screenshots.includes('login')) {
+        if (this.screenshots.includes(screenshot_login)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
@@ -145,14 +155,14 @@ export class CheckoutPage {
         await this.shippingMethod()
         await this.paymentMethod()
 
-        if (screenshots.includes('payment')) {
+        if (this.screenshots.includes(screenshot_payment)) {
             await new BasePage(this.page).screenshot('fullpage')
         }
 
         await this.continue('success')
         await this.success()
 
-        if (screenshots.includes('success')) {
+        if (this.screenshots.includes(screenshot_success)) {
             await new BasePage(this.page).screenshot('fullpage-footer')
         }
     }