Restore correctness to the pm_password field

Change-Id: Ie9c3c3f960eb27912acbea21266459341d6fd12c