Bug: 13208 Fix generating From: address.
BFN