Refactorings to break into smaller boxes.

Signed-off-by: Mike Gehard <mike.gehard@gmail.com>
Confirm password reset works all the way through

Signed-off-by: Mike Gehard <mike.gehard@gmail.com>