revert
bugfix #9: hash and salt password => non BW compatible
fix conflict