Use the group name if there is not display_name

And avoid repeating the group name in this case