Bug 32221: Borrowers.password should no longer be an option