Use PasswordUtil library wherever possible
Renamed config params