CLIENT tag in emails uses WP username, would like to use first name

The available tag for emails is CLIENT. This pulls the WP username not the nicename. Is there a way to use FirstName or something else in the emails? They look really unprofessional if the client created a WP username other than their real name. I don't see any other tags which can be used.
Thanks!