diff --git a/Front-End/src/components/ProfileDirectory.js b/Front-End/src/components/ProfileDirectory.js
index 0809644..2c6533b 100644
--- a/Front-End/src/components/ProfileDirectory.js
+++ b/Front-End/src/components/ProfileDirectory.js
@@ -85,26 +85,31 @@ const ProfileDirectory = ({ profileRoles, handleActivateProfile, handleDeletePro
       )
     },
     { name: 'Utilisateur', transform: (row) => (
-      <div className="flex flex-col justify-center space-y-2">
-        {row.associated_person?.guardian_name}
-        </div>
-      )
-    },
-    { name: 'Elève(s) associé(s)', transform: (row) => (
-      <div className="flex flex-col justify-center space-y-2">
-        {row.associated_person?.students?.map(student => (
-          <span key={student.student_name} className="px-2 py-1 rounded-full text-gray-800">
-            {student.student_name}
-          </span>
-        ))}
-      </div>
-      )
-    },
-    { name: 'Etat du dossier d\'inscription', transform: (row) => (
-        <div className="flex flex-col justify-center items-center space-y-2">
-          {row.associated_person?.students?.map(student => (
-            <StatusLabel key={student.student_name} status={student.registration_status} showDropdown={false} />
-          ))}
+        <div className="flex items-center justify-center space-x-2">
+          <span>{row.associated_person?.guardian_name}</span>
+          {row.associated_person && (
+            <Tooltip content={
+              <div>
+                <div className="mb-2">
+                  <strong>Elève(s) associé(s):</strong>
+                  <div className="flex flex-col justify-center space-y-2">
+                    {row.associated_person?.students?.map(student => (
+                      <div key={student.student_name} className="flex justify-between items-center">
+                        <span className="px-2 py-1 rounded-full text-gray-800">
+                          {student.student_name}
+                        </span>
+                        <StatusLabel status={student.registration_status} showDropdown={false} />
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              </div>
+            }>
+              <button className="text-blue-500 hover:text-blue-700">
+                <Info className="w-5 h-5" />
+              </button>
+            </Tooltip>
+          )}
         </div>
       )
     },
@@ -142,32 +147,34 @@ const ProfileDirectory = ({ profileRoles, handleActivateProfile, handleDeletePro
     { name: 'Utilisateur', transform: (row) => (
         <div className="flex items-center justify-center space-x-2">
           <span>{row.associated_person?.teacher_name}</span>
-          <Tooltip content={
-            <div>
-              <div className="mb-2">
-                <strong>Classes associées:</strong>
-                <div className="flex flex-wrap justify-center space-x-2">
-                  {row.associated_person?.classes?.map(classe => (
-                    <span key={classe.id} className="px-2 py-1 rounded-full bg-gray-200 text-gray-800">
-                      {classe.name}
-                    </span>
-                  ))}
-                </div>
-              </div>
+          {row.associated_person && (
+            <Tooltip content={
               <div>
-                <strong>Spécialités:</strong>
-                <div className="flex flex-wrap justify-center space-x-2">
-                  {row.associated_person?.specialities?.map(speciality => (
-                    <SpecialityItem key={speciality.name} speciality={speciality} isDraggable={false} />
-                  ))}
+                <div className="mb-2">
+                  <strong>Classes associées:</strong>
+                  <div className="flex flex-wrap justify-center space-x-2">
+                    {row.associated_person?.classes?.map(classe => (
+                      <span key={classe.id} className="px-2 py-1 rounded-full bg-gray-200 text-gray-800">
+                        {classe.name}
+                      </span>
+                    ))}
+                  </div>
+                </div>
+                <div>
+                  <strong>Spécialités:</strong>
+                  <div className="flex flex-wrap justify-center space-x-2">
+                    {row.associated_person?.specialities?.map(speciality => (
+                      <SpecialityItem key={speciality.name} speciality={speciality} isDraggable={false} />
+                    ))}
+                  </div>
                 </div>
               </div>
-            </div>
-          }>
-            <button className="text-blue-500 hover:text-blue-700">
-              <Info className="w-5 h-5" />
-            </button>
-          </Tooltip>
+            }>
+              <button className="text-blue-500 hover:text-blue-700">
+                <Info className="w-5 h-5" />
+              </button>
+            </Tooltip>
+          )}
         </div>
       )
     },