[1.6.x] Fixed #20134 -- Correct list of fields that UserManager requires.

Thanks semenov and pegler.

Backport of da5069f68f from master.