Improve donor account number handling