diff --git a/src/test/java/com/ea/springbasic/pages/ComingSoonPage.java b/src/test/java/com/ea/springbasic/pages/ComingSoonPage.java
index 7730c8b..9d45566 100644
--- a/src/test/java/com/ea/springbasic/pages/ComingSoonPage.java
+++ b/src/test/java/com/ea/springbasic/pages/ComingSoonPage.java
@@ -17,11 +17,17 @@ public class ComingSoonPage extends BasePage {
     @FindBy(id = "Password")
     private WebElement passwordInput;
 
+    @FindBy(xpath = "//button[contains(text(),'Accept all')]")
+    private WebElement acceptCookiesButton;
+
     public void clickActivatePasswordInput() {
         enterUsingPasswordButton.click();
     }
 
     public void login(String password) {
+        fluentWait.until(ExpectedConditions.elementToBeClickable(acceptCookiesButton));
+        acceptCookiesButton.click();
+        enterUsingPasswordButton.click();
         webDriverWait.until(ExpectedConditions.elementToBeClickable(passwordInput));
         passwordInput.sendKeys(password);
         passwordInput.sendKeys(Keys.ENTER);
diff --git a/src/test/java/com/ea/springbasic/pages/HomePage.java b/src/test/java/com/ea/springbasic/pages/HomePage.java
index 76ecaa6..41b0821 100644
--- a/src/test/java/com/ea/springbasic/pages/HomePage.java
+++ b/src/test/java/com/ea/springbasic/pages/HomePage.java
@@ -17,9 +17,6 @@ public class HomePage extends BasePage {
     @FindBy(xpath = "//a[@href='/collections/apparel']")
     private WebElement shopNowButton;
 
-    @FindBy(xpath = "//button[contains(text(),'Accept all')]")
-    private WebElement acceptCookiesButton;
-
     public void clickLoginAccountButton() {
         loginAccountButton.click();
     }
@@ -30,8 +27,6 @@ public void clickShopNowButton() {
 
     @Override
     public boolean isDisplayed() {
-        fluentWait.until(ExpectedConditions.elementToBeClickable(acceptCookiesButton));
-        acceptCookiesButton.click();
         return fluentWait.until((d) -> defaultLogo.isEnabled());
     }
 }
diff --git a/src/test/java/com/ea/springbasic/pages/LoginPage.java b/src/test/java/com/ea/springbasic/pages/LoginPage.java
index 9499c43..94f5d79 100644
--- a/src/test/java/com/ea/springbasic/pages/LoginPage.java
+++ b/src/test/java/com/ea/springbasic/pages/LoginPage.java
@@ -19,10 +19,14 @@ public class LoginPage extends BasePage {
     @FindBy(xpath = "//button[@type='submit']")
     private WebElement submitButton;
 
+    @FindBy(xpath = "//button//span[@class='show']")
+    private WebElement showButton;
+
     public void login(String email, String password) {
         customerEmailInput.sendKeys(email);
         this.passwordInput.sendKeys(password);
         fluentWait.until((d) -> submitButton.getAttribute("aria-disabled").equals("false"));
+        showButton.click();
         submitButton.click();
     }
 
diff --git a/src/test/java/com/ea/springbasic/steps/Hooks.java b/src/test/java/com/ea/springbasic/steps/Hooks.java
index efbbf5c..a1a3ee5 100644
--- a/src/test/java/com/ea/springbasic/steps/Hooks.java
+++ b/src/test/java/com/ea/springbasic/steps/Hooks.java
@@ -65,7 +65,6 @@ public void setup(Scenario scenario) {
         webDriver.manage().window().maximize();
 
         if (env.equals("dev")) {
-            comingSoonPage.clickActivatePasswordInput();
             comingSoonPage.login(systemPassword);
         }
     }