Make sure password password keys are commited properly.

Fixes bug when not using password keys for a password.