user hidden password
Merge branch 'master' into develop
bugfix hidden password