ENG-7307: check contains for password. review changes.