Admin can't edit a user who's password is forced to be changed

We have enabled the option to force new users to change their passwords upon login. If an admin creates a new user account, saves the new user, then goes back later and tries to edit the user (to change the user's roles for example), they receive an error when saving the form telling them they must create a new password.

I would expect the administrator should be able to make any changes to the user account and the force password change code should only come into effect when the user logs in.