Revert "Stop hydrating password fields"

This reverts commit 1a61a6f881fbdfe56ecfc8887dbd55bb22bb58ee.