Bug 18025: Simplify logic and avoid 1 call to ValidateBorrowernumber