Continued a bit: (please cherry-pick)

[addressbook-war.git] / web / user / login_index.xhtml

diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index c9f812376808e5e658d2a5ad0f5de53d3902917c..b85c6661c0a1bd55cb200dfd14a5b318225c7e91 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -15,7 +15,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.ifUserMustChangePassword()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
                                Here goes your content.
                        </ui:fragment>