diff --git a/dockerfiles/init/manifests/che.env b/dockerfiles/init/manifests/che.env
index 6585f2bf61..88e1a8de04 100644
--- a/dockerfiles/init/manifests/che.env
+++ b/dockerfiles/init/manifests/che.env
@@ -540,6 +540,7 @@ CHE_SINGLE_PORT=false
 #CHE_KEYCLOAK_REALM=che
 #CHE_KEYCLOAK_CLIENT__ID=che-public
 #CHE_KEYCLOAK_ALLOWED__CLOCK__SKEW__SEC=3
+#CHE_KEYCLOAK_ADMIN_REQUIRE_UPDATE_PASSWORD=true
 
 
 ########################################################################################
diff --git a/dockerfiles/init/manifests/che.pp b/dockerfiles/init/manifests/che.pp
index 79263aecc5..3944203397 100644
--- a/dockerfiles/init/manifests/che.pp
+++ b/dockerfiles/init/manifests/che.pp
@@ -65,6 +65,8 @@ node default {
 
   $system_super_privileged_mode=getValue("SYSTEM_SUPER__PRIVILEGED__MODE", "false")
 
+  $che_keycloak_admin_require_update_password=getValue("CHE_KEYCLOAK_ADMIN_REQUIRE_UPDATE_PASSWORD", "true")
+
   ###############################
   # Include base module
   include base
diff --git a/dockerfiles/init/modules/keycloak/templates/che-users-0.json.erb b/dockerfiles/init/modules/keycloak/templates/che-users-0.json.erb
index 073085ce06..13564becfa 100644
--- a/dockerfiles/init/modules/keycloak/templates/che-users-0.json.erb
+++ b/dockerfiles/init/modules/keycloak/templates/che-users-0.json.erb
@@ -23,7 +23,11 @@
       "config" : { }
     } ],
     "disableableCredentialTypes" : [ "password" ],
+    <% if scope.lookupvar('keycloak::che_keycloak_admin_require_update_password') == 'true' -%>
     "requiredActions" : [ "UPDATE_PASSWORD" ],
+    <% else -%>
+    "requiredActions" : [ ],
+    <% end -%>
     "groups" : [ ]
   } ]
 }
diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FindText.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FindText.java
index f5166fbaf8..f1435ab778 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FindText.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FindText.java
@@ -105,6 +105,7 @@ public class FindText {
 
   /** wait the 'Find Text' main form is closed */
   public void waitFindTextMainFormIsClosed() {
+    loader.waitOnClosed();
     new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC)
         .until(ExpectedConditions.invisibilityOfElementLocated(By.id(Locators.MAIN_FORM)));
   }