Improve passwords module selection.