[#7692] clean up claim_address logic

* put the `if` statement around the email_address.append call itself, rather than having
2 return paths which cause inconsistency with the flush call
* return the email_addr record for convenience