Fix persistent password

NTH: `passwd` and `password` can be a bit confusing together in fact, `password` could be `current_password`, but that would need bigger changes