diff --git a/front/src/components/table/CellLink.tsx b/front/src/components/table/CellLink.tsx
index 623f542da..e577854f6 100644
--- a/front/src/components/table/CellLink.tsx
+++ b/front/src/components/table/CellLink.tsx
@@ -1,19 +1,15 @@
 import * as React from 'react';
 import { Link } from 'react-router-dom';
-import CompanyChip from '../chips/CompanyChip';
 
 type OwnProps = {
   name: string;
   picture?: string;
   href: string;
+  children?: React.ReactNode;
 };
 
-function CellLink({ name, picture, href }: OwnProps) {
-  return (
-    <Link to={href}>
-      <CompanyChip name={name} picture={picture} />
-    </Link>
-  );
+function CellLink({ href, children }: OwnProps) {
+  return <Link to={href}>{children}</Link>;
 }
 
 export default CellLink;
diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx
index fc6831b42..5fae4d689 100644
--- a/front/src/pages/people/People.tsx
+++ b/front/src/pages/people/People.tsx
@@ -18,6 +18,7 @@ import personPlaceholder from './placeholder.png';
 import { parsePhoneNumber, CountryCode } from 'libphonenumber-js';
 import Checkbox from '../../components/form/Checkbox';
 import HorizontalyAlignedContainer from '../../layout/containers/HorizontalyAlignedContainer';
+import CompanyChip from '../../components/chips/CompanyChip';
 
 type Person = {
   fullName: string;
@@ -116,7 +117,12 @@ const columns = [
           name={props.row.original.fullName}
           picture={props.row.original.picture}
           href="#"
-        />
+        >
+          <CompanyChip
+            name={props.row.original.fullName}
+            picture={props.row.original.picture}
+          />
+        </CellLink>
       </HorizontalyAlignedContainer>
     ),
   }),
@@ -132,10 +138,15 @@ const columns = [
     header: () => <ColumnHead viewName="Company" viewIcon={faBuildings} />,
     cell: (props) => (
       <CellLink
-        name={props.row.original.company.name}
-        picture={`https://www.google.com/s2/favicons?domain=${props.row.original.company.domain}&sz=256`}
+        name={props.row.original.fullName}
+        picture={props.row.original.picture}
         href="#"
-      />
+      >
+        <CompanyChip
+          name={props.row.original.company.name}
+          picture={`https://www.google.com/s2/favicons?domain=${props.row.original.company.domain}&sz=256`}
+        />
+      </CellLink>
     ),
   }),
   columnHelper.accessor('phone', {
@@ -167,10 +178,15 @@ const columns = [
     header: () => <ColumnHead viewName="Pipe" viewIcon={faRectangleList} />,
     cell: (props) => (
       <CellLink
-        name={props.row.original.pipe.name}
-        picture={props.row.original.pipe.icon}
+        name={props.row.original.fullName}
+        picture={props.row.original.picture}
         href="#"
-      />
+      >
+        <CompanyChip
+          name={props.row.original.pipe.name}
+          picture={props.row.original.pipe.icon}
+        />
+      </CellLink>
     ),
   }),
   columnHelper.accessor('city', {