diff --git a/constraints/constraint_delay.inc b/constraints/constraint_delay.inc
index c6612c5..2767571 100644
--- a/constraints/constraint_delay.inc
+++ b/constraints/constraint_delay.inc
@@ -29,6 +29,12 @@ function password_policy_constraint_delay_error($constraint) {
  * Password validation.
  */
 function password_policy_constraint_delay_validate($password, $constraint, $uid) {
+  $account = user_load($uid);
+  // bypass delay constraint, if account is marked "Force password change on next login."
+  if ($account->force_password_change) {
+    return TRUE;
+  }
+
   $last_change = db_result(db_query_range("SELECT MAX(created) FROM {password_policy_history} WHERE uid = %d", $uid, 0, 1));
   if (!empty($last_change)) {
     // Constraint is set in hours, so it gets converted to seconds with *60*60.