Reset password tool on expired account requires current password

When a user who's account has expired tries to use the reset password tool (assuming they forgot the old one), they are sent to the expired password form instead, which asks them to enter their old password as well as the new one. Since they reset it, they obviously won't have it. ;-)