transfer fix, password validation and encoding
merge