Don't show password fields
Merge branch 'master' into develop