Fix password type to allow saving a null password.
Merge branch 'master' into topics/database-functions