updated jar(s)

[pizzaservice-war.git] / web / user / login_change_email_address.xhtml

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 3fb7ca98c028f37026ec50a1334ab5e777500853..f329ea456e25c7147a37c948a76c182da53d12e5 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -15,13 +15,13 @@
                </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'))}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                                        </div>
 
-                                       <h:form id="login_change_email_address_form">
+                                       <h:form id="form_login_change_email_address">
                                                <div class="para">
                                                        <fieldset id="change_email">
                                                                <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">