diff --git a/client/src/components/Message.tsx b/client/src/components/Message.tsx
index d4702f9..dbf1e65 100644
--- a/client/src/components/Message.tsx
+++ b/client/src/components/Message.tsx
@@ -38,7 +38,7 @@ const Message = ({ message }: any) => {
   return (
     <>
       <div
-        className="flex bg-grey-dark rounded-xl w-full max-w-3xl p-5 gap-5 shadow-md shadow-grey-dark"
+        className="message flex bg-grey-dark rounded-xl w-full max-w-3xl p-5 gap-5 shadow-md shadow-grey-dark"
         id={'messageId' + message.id}
       >
         {message.author && <Avatar user={message.author} />}
diff --git a/client/src/components/ScrollToBottom.tsx b/client/src/components/ScrollToBottom.tsx
index 6274c68..de73a92 100644
--- a/client/src/components/ScrollToBottom.tsx
+++ b/client/src/components/ScrollToBottom.tsx
@@ -21,7 +21,8 @@ const ScrollToBottom = ({ children, className = '' }: { children: ReactNode; cla
         setShow(false);
       }
     });
-    container?.addEventListener('DOMNodeInserted', () => {
+    container?.addEventListener('DOMNodeInserted', (e) => {
+      if (!(e.target as Element).classList.contains('message')) return;
       if (node?.getBoundingClientRect() && node.getBoundingClientRect().y >= window.innerHeight) {
         node?.scrollIntoView({ behavior: 'smooth' });
       }
diff --git a/client/src/components/User.tsx b/client/src/components/User.tsx
index aee8875..faa8ce0 100644
--- a/client/src/components/User.tsx
+++ b/client/src/components/User.tsx
@@ -1,28 +1,84 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import Modal from './Modal';
 
 const User = ({ author }: any) => {
   const [show, setShow] = useState(false);
+  const [popupPos, setPopupPos] = useState({ posX: 0, posY: 0 });
+  const [messageId, setMessageId] = useState('0');
+
+  function handleContextMenu(e: any) {
+
+    if (messageId!== '0' && e.target.closest('.message')?.id.slice(9) !== messageId) {
+      setPopupPos({ posX: 0, posY: 0});
+      setMessageId('0');
+      document.removeEventListener('contextmenu', handleContextMenu);
+    }
+  }
+  document.addEventListener('contextmenu', handleContextMenu);
+
+  function handleClick(e: any) {
+    if (e.target.closest('.user') === null) {
+      setPopupPos({ posX: 0, posY: 0 });
+      setMessageId('0');
+      document.removeEventListener('click', handleClick);
+    }
+  }
+
+  document.addEventListener('click', handleClick);
+
+  const handleRightClick = (e: any) => {
+    e.preventDefault();
+    setMessageId(e.target.closest('.message').id.slice(9));
+
+    setPopupPos({ posX: e.clientX, posY: e.clientY });
+  };
 
   return (
-    <>
-      <button className="text-red-light text-xl username" onClick={() => setShow(true)}>
+    <div className="user">
+      <button
+        className="text-red-light text-xl username"
+        onClick={() => setShow(true)}
+        onContextMenu={handleRightClick}
+      >
         {author.firstName} {author.lastName}
       </button>
+      {popupPos.posX !== 0 && (
+        <div
+          className={`popup-admin absolute z-10 left-[${popupPos.posX}px] top-[${
+            popupPos.posY + 20
+          }px] bg-grey-dark shadow-lg shadow-slate-900 rounded-xl p-2`}
+        >
+          <div className="popup-content space-y-2">
+            <button
+              className="popup-item block text-white rounded-xl p-2 transition-all hover:cursor-pointer hover:bg-grey-light hover:text-grey-dark"
+              onClick={() => {
+                setPopupPos({ posX: 0, posY: 0 });
+              }}
+            >
+              Donner le role d'admin
+            </button>
+          </div>
+        </div>
+      )}
       <Modal show={show}>
         <div className="flex flex-col gap-5">
           <div className="flex flex-col gap-2">
-            <div className="text-2xl text-white">User info</div>
-            <div className="text-white">First name: {author.firstName}</div>
-            <div className="text-white">Last name: {author.lastName}</div>
-            <div className="text-white">Email: {author.email}</div>
+            <div className="text-2xl text-white">Info utilisateur</div>
+            <div className="text-white">Nom: {author.lastName}</div>
+            <div className="text-white">Prenom: {author.firstName}</div>
+            <div className="text-white">
+              Adresse mail: <a href={'mailto:' + author.email}>{author.email}</a>
+            </div>
           </div>
-          <button className="btn" onClick={() => setShow(false)}>
-            Close
+          <button
+            className="rounded-md border border-red bg-red py-2 px-4 text-sm max-w-[100px] font-medium text-white hover:bg-white hover:text-red focus:outline-none focus:ring-2 focus:ring-red focus:ring-offset-2"
+            onClick={() => setShow(false)}
+          >
+            Fermer
           </button>
         </div>
       </Modal>
-    </>
+    </div>
   );
 };