[1.6.x] Fixed #21726 -- Clarified that password should not be included in REQUIRED_FIELDS.

Thanks russellm for the report.

Backport of 6f06c749b7 from master