remove checking password..
merge dev