admin password reset with override token is throwing an error

[TanyaStere42]

Expected Behavior

1. sign in as first admin with the password override
2. go to user management
3. edit first admin account
4. fill out form for password change
5. enter password override token in password confirmation and click submit 6. password is updated

Current Behavior

1. sign in as first admin with the password override
2. go to user management
3. edit first admin account
4. fill out form for password change
5. enter password override token in password confirmation and click submit 6. error thrown with "password incorrect", password is not updated

Testing Notes Make sure you do not reset the override token between testing runs

Technical Notes

• likely the password form needs to accept both the old password and the password override as the old password