Revert "Revert "fix passwd""

This reverts commit fd90defaeab880bf28fe09d228ce9cb07d022e21.
Revert "Revert "Revert "fix passwd"""

This reverts commit 9701ad71d2b74334282fa576a2cf909e3175cca7.