diff --git a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/factory/TestFactory.java b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/factory/TestFactory.java
index cff9599362..4fd26a82bc 100644
--- a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/factory/TestFactory.java
+++ b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/factory/TestFactory.java
@@ -49,9 +49,7 @@ public class TestFactory {
   /** Adds authentication token into the browser and opens factory url. */
   public void authenticateAndOpen(SeleniumWebDriver driver) throws Exception {
     driver.get(dashboardUrl.get().toString());
-
     entrance.login(owner);
-
     driver.get(factoryUrl);
   }
 
diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/site/CheLoginPage.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/site/CheLoginPage.java
index ed9a571721..f06dd3d3d5 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/site/CheLoginPage.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/site/CheLoginPage.java
@@ -63,7 +63,8 @@ public class CheLoginPage implements LoginPage {
 
   public void waitOnClose() {
     webDriverWait.until(
-        ExpectedConditions.invisibilityOfAllElements(ImmutableList.of(loginButton)));
+        ExpectedConditions.invisibilityOfAllElements(
+            ImmutableList.of(loginButton, passwordInput, usernameInput)));
   }
 
   public boolean isOpened() {