Refactor to add user.name for displaying name OR email