Continued porting templates:

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

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 5be9181274c2ff56b46bb94773d3d11d75acf575..2e61450d151c040a556cad8d654498b3c9f3c853 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -11,11 +11,11 @@
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and not userLoginController.ifUserMustChangePassword()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
                                </ui:include>