Please fix merge code error in B2B emails

In the "Invitation to B2B" template both [RecipientName] and [ContactEmail] are pulling up the customer's email address.

and in the "Reset Password" template [UserName] is an available option and it does return the correct customer name.

This is an error that was recently introduced, not a feature. Please fix it.