Update name_or_email to return name only if not set to Guest