Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / user / password / JobsUserPasswordWebRequestBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
index 031308318ea50d3fab8109191b7930feb3f3c686..a982edc866d04f267aabeb94d0568f25ded16b5c 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
@@ -26,6 +26,7 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jcoreee.utils.FacesUtils;
 import org.mxchange.jjobs.beans.BaseJobsController;
 import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController;
 import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
@@ -165,11 +166,15 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
                String encryptedPassword = UserUtils.encryptPassword(this.getUserPassword());
 
                // Set it in user
+               user.setUserMustChangePassword(Boolean.FALSE);
                user.setUserEncryptedPassword(encryptedPassword);
 
                try {
+                       // Get base URL
+                       String baseUrl = FacesUtils.generateBaseUrl();
+
                        // All is set, then update password
-                       PasswordHistory passwordHistory = this.userBean.updateUserPassword(user);
+                       PasswordHistory passwordHistory = this.userBean.updateUserPassword(user, baseUrl);
 
                        // Fire event
                        this.userUpdatedPasswordEvent.fire(new UserUpdatedPasswordEvent(passwordHistory));