fix password bug CR: PSG