CC-4829: Password Verify does not work on Lucid

-code cleanup