Exclude password from the form
Merge branch 'master' into kingman