enable checking password
merge dev