diff --git a/APPL/Shared/Login.inc b/APPL/Shared/Login.inc
index 01d91b5213..748d455d4e 100644
--- a/APPL/Shared/Login.inc
+++ b/APPL/Shared/Login.inc
@@ -409,7 +409,8 @@ function setpassword(prs_key, wachtwoord)
         var workfactor = S("prs_password_hash_factor");
         var is_hash = pbkdf2(wachtwoord, passsalt, workfactor);
         var sql = "UPDATE prs_perslid"
-                + "   SET prs_perslid_salt = " + safe.quoted_sql(passsalt)
+                + "   SET prs_perslid_wachtwoord_exp = NULL" // Niet meer expired. Ooit: SYSDATE + fac.getsetting ('prs_password_expiration') als die is gevuld
+                + "     , prs_perslid_salt = " + safe.quoted_sql(passsalt)
                 + "     , prs_perslid_wachtwoord_hash = " + safe.quoted_sql('1${0}${1}'.format(workfactor, is_hash))
                 + " WHERE prs_perslid_key = " + prs_key;
         Oracle.Execute(sql);