Passwords CR-II changes