Improve passwords management