fix claim by password to work with new system