remove raw password
fixCR changed