pwreset: Fixup password reset system

Turns out that the new authentication system incorrectly cancels the reset
tokens when it processes logins rather than after the user successfully
resets his/her password
Merge pull request #671 from greezybacon/issue/pwreset-broken

pwreset: Fixup password reset system

Reviewed-By: Peter Rotich <peter@osticket.com>