diff --git a/apps/website/screens/components/avatar/code/AvatarCodePage.tsx b/apps/website/screens/components/avatar/code/AvatarCodePage.tsx
index f02fd4e3b..1d55b83a5 100644
--- a/apps/website/screens/components/avatar/code/AvatarCodePage.tsx
+++ b/apps/website/screens/components/avatar/code/AvatarCodePage.tsx
@@ -92,6 +92,22 @@ const sections = [
             <td>This function will be called when the user clicks the avatar. Makes it behave as a button.</td>
             <td>-</td>
           </tr>
+          <tr>
+            <td>primaryText</td>
+            <td>
+              <TableCode>string</TableCode>
+            </td>
+            <td>Text to be displayed as label next to the avatar.</td>
+            <td>-</td>
+          </tr>
+          <tr>
+            <td>secondaryText</td>
+            <td>
+              <TableCode>string</TableCode>
+            </td>
+            <td>Text to be displayed as sublabel next to the avatar.</td>
+            <td>-</td>
+          </tr>
           <tr>
             <td>shape</td>
             <td>
@@ -128,7 +144,9 @@ const sections = [
             <td>
               <TableCode>number</TableCode>
             </td>
-            <td>Value of the tabindex attribute. It will only apply when the onClick property is passed.</td>
+            <td>
+              Value of the tabindex attribute. It will only apply when the onClick or linkHref property is passed.
+            </td>
             <td>
               <TableCode>0</TableCode>
             </td>
diff --git a/apps/website/screens/components/avatar/code/examples/basicUsage.tsx b/apps/website/screens/components/avatar/code/examples/basicUsage.tsx
index c38a26051..73a8cb95d 100644
--- a/apps/website/screens/components/avatar/code/examples/basicUsage.tsx
+++ b/apps/website/screens/components/avatar/code/examples/basicUsage.tsx
@@ -4,8 +4,10 @@ const code = `() => {
   return (
     <DxcInset space="var(--spacing-padding-xl)">
       <DxcAvatar
-        label="John Doe"
+        label="Michael Ramirez"
         color="success"
+        primaryText="Michael Ramirez"
+        secondaryText="m.ramirez@insurance.com"
       />
     </DxcInset>
   );
diff --git a/packages/lib/src/avatar/Avatar.tsx b/packages/lib/src/avatar/Avatar.tsx
index b3aee1c90..3a6039614 100644
--- a/packages/lib/src/avatar/Avatar.tsx
+++ b/packages/lib/src/avatar/Avatar.tsx
@@ -105,7 +105,7 @@ const DxcAvatar = memo(
           shape={shape}
           size={size}
           status={status}
-          tabIndex={tabIndex}
+          tabIndex={onClick || linkHref ? tabIndex : undefined}
           title={title}
         />
       </LabelWrapper>