Issue 1232 password reset

This PR changes the location the user enters their password for a password reset. For the normal password reset flow, a user now enters their password post-verification.

fixes #1232