Forces user password reset after password was reset already by simple_pass_reset

Problem:
When users reset their password as anon with simple_pass_reset and "force password change" is checked on that user, password_policy makes them reset their password a second time after login.

When saving a user, password_policy does this:

  global $user;

  // If the current user is being forced to change their password and is
  // changing their password, toggle the force_change field off.
  if (isset($account->original->force_password_change) && $account->original->force_password_change && isset($edit['pass']) && $user->uid == $account->uid) {
    db_update('password_policy_force_change')
      ->fields(array(
        'force_change' => 0,
      ))
      ->condition('uid', $account->uid)
      ->execute();

However, when a user account is being saved by simple_pass_reset this fails because when users are setting their password via the simple_pass_reset module they are not logged in and thus $user->uid is zero and does not match $user->account uid.

I solved this with a custom module:

function mymodule_user_update(&$edit, $account, $category) {
  // This code is exactly like `password_policy_user_update` except they check
  // that $user->uid == $account->uid. But when allowing password reset before login
  // using simple_pass_reset, $user->uid is 0--but a legitimate password update
  // is being performed. So this additional safety check can be bypassed.
  global $user;
  if (isset($account->original->force_password_change)
    && $account->original->force_password_change
    && isset($edit['pass'])
    && $user->uid == 0) {
    db_update('password_policy_force_change')
      ->fields(array(
        'force_change' => 0,
      ))
      ->condition('uid', $account->uid)
      ->execute();
    db_delete('password_policy_expiration')
      ->condition('uid', $account->uid)
      ->execute();
  }
}

I imagine dev is mostly happening on D8, but I wanted to post for others in case this was happening to them and they wanted to use this workaround.