included some changes to display email or name