more progress toward password reset #416