am 96d6d786: Cleanup password change and removal logic.

* commit '96d6d7868303ad87f1f408c40d3c44bcb39f561e':
  Cleanup password change and removal logic.