Allow new user's password to be set
Merge remote-tracking branch 'origin/master'