Please cherry-pick:

[jjobs-war.git] / web / user / login_change_password.xhtml

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index 6bbde0a3738b5463463444743742396f6b1f7d95..dc647b75027143a7434c02c5860ab863723a1f36 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -65,7 +65,7 @@
                                                                </div>
 
                                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                                </h:panelGroup>
                                                        </fieldset>
                                                </div>
@@ -74,7 +74,7 @@
 
                                                <div class="table_footer">
                                                        <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
                                                </div>
                                        </h:form>
                                </h:panelGroup>