KFSUPGRADE-1051 When returning from payee lookup set the email address
to the person's or entity's email address depending on the payee type