SC-52 Change password reset mechanics
SC-52 Change findPersonById to use optional