Rework password reset system to do away with the second email and instead