diff --git a/packages/functional-tests/tests/cms/cms-2fa.spec.ts b/packages/functional-tests/tests/cms/cms-2fa.spec.ts
index 11fa225b228..c14067b92ac 100644
--- a/packages/functional-tests/tests/cms/cms-2fa.spec.ts
+++ b/packages/functional-tests/tests/cms/cms-2fa.spec.ts
@@ -56,7 +56,7 @@ test.describe('severity-1 #smoke', () => {
       await expect(button).toHaveCSS('--cta-bg', buttonColor);
       await expect(button).toHaveCSS('--cta-border', buttonColor);
       await expect(button).toHaveCSS('--cta-active', buttonColor);
-      await expect(button).toHaveCSS('--cta-disabled', `${buttonColor}60`);
+      await expect(button).toHaveCSS('--cta-disabled', buttonColor);
     }
 
     test.beforeAll(async ({ target }) => {
diff --git a/packages/functional-tests/tests/cms/cms.spec.ts b/packages/functional-tests/tests/cms/cms.spec.ts
index 25512ba19c7..eacbdb48ad6 100644
--- a/packages/functional-tests/tests/cms/cms.spec.ts
+++ b/packages/functional-tests/tests/cms/cms.spec.ts
@@ -55,7 +55,7 @@ test.describe('severity-1 #smoke', () => {
       await expect(button).toHaveCSS('--cta-bg', buttonColor);
       await expect(button).toHaveCSS('--cta-border', buttonColor);
       await expect(button).toHaveCSS('--cta-active', buttonColor);
-      await expect(button).toHaveCSS('--cta-disabled', `${buttonColor}60`);
+      await expect(button).toHaveCSS('--cta-disabled', buttonColor);
     }
 
     test.beforeAll(async ({ target }) => {
@@ -160,11 +160,16 @@ test.describe('severity-1 #smoke', () => {
           buttonColor: '#4845D2',
           buttonText: 'Continue',
         });
-        await signin.passwordTextbox.fill(credentials.password);
         submitButton = page.getByRole('button', {
           name: 'Continue',
           exact: true,
         });
+        // expect button to be disabled until password fields are filled
+        await expect(submitButton).toBeDisabled();
+        await expect(submitButton).toHaveCSS('opacity', '0.5');
+        await signin.passwordTextbox.fill(credentials.password);
+        await expect(submitButton).toBeEnabled();
+        await expect(submitButton).toHaveCSS('opacity', '1');
         await submitButton.click();
 
         await assertCmsCustomization(page, {