Fix brainos from misapplied patches.  Add improved password checking.
6 files changed