Bug 6164 Send Borrower Data to template consistently