diff --git a/app/components/settings/match-student.tsx b/app/components/settings/match-student.tsx
new file mode 100644
index 0000000..4f3f922
--- /dev/null
+++ b/app/components/settings/match-student.tsx
@@ -0,0 +1,84 @@
+import { useEffect, useState } from "react";
+import { Combobox } from "~/components/combobox";
+import { Label } from "~/components/ui/label";
+import { getStudentMatch, mergeStudent } from "~/lib/api";
+
+type Student = {
+  id: string;
+  fistName: string;
+  lastName: string;
+};
+
+export function MatchStudent({
+  firstName,
+  lastName,
+  onSuccess,
+}: {
+  firstName: string;
+  lastName: string;
+  onSuccess: (student: Student) => void;
+}) {
+  const [pastClasses, setPastClasses] = useState<
+    { value: string; label: string }[]
+  >([]);
+  useEffect(() => {
+    fetch("/past_classes.json")
+      .then((res) => res.json())
+      .then((data) => {
+        setPastClasses(data);
+      });
+  }, []);
+
+  const [pastClassName, setPastClassName] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [matchedStudent, setMatchedStudent] = useState<Student | null>(null);
+
+  useEffect(() => {
+    if (pastClassName) {
+      setIsLoading(true);
+      getStudentMatch(firstName, lastName, pastClassName)
+        .then((student) => {
+          setMatchedStudent(student);
+          setIsLoading(false);
+        })
+        .catch(() => {
+          setMatchedStudent(null);
+          setIsLoading(false);
+        });
+    }
+  }, [pastClassName, firstName, lastName]);
+
+  const handleValidate = () => {
+    if (matchedStudent) {
+      mergeStudent(matchedStudent.id).then(() => {
+        onSuccess(matchedStudent);
+      });
+    }
+  };
+
+  return (
+    <div className="space-y-2">
+      <Label>Classe de l'année dernière</Label>
+      <div className="block">
+        <Combobox
+          defaultText="Sélectionnez votre classe..."
+          values={pastClasses}
+          emptyText="Aucune classe trouvée"
+          placeholderText="Rechercher"
+          current={pastClassName}
+          setValue={setPastClassName}
+        />
+      </div>
+      {isLoading && <p>Recherche en cours...</p>}
+      {matchedStudent && (
+        <div className="flex items-center justify-between">
+          <p>
+            Correspondance trouvée: {matchedStudent.fistName}{" "}
+            {matchedStudent.lastName}
+          </p>
+          <button onClick={handleValidate}>Valider</button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/app/components/settings/profile.tsx b/app/components/settings/profile.tsx
index fa38602..6444836 100644
--- a/app/components/settings/profile.tsx
+++ b/app/components/settings/profile.tsx
@@ -8,6 +8,8 @@ import { Label } from "../ui/label";
 import { Badge } from "../ui/badge";
 import { useQueryClient } from "@tanstack/react-query";
 import { useNavigate } from "react-router";
+import { MatchStudent } from "./match-student";
+import { Separator } from "../ui/separator";
 
 export default function Profile({ user }: { user: User }) {
   const navigate = useNavigate();
@@ -64,6 +66,18 @@ export default function Profile({ user }: { user: User }) {
           </div>
         </div>
 
+        <Separator />
+
+        <MatchStudent
+          firstName={user.firstName}
+          lastName={user.lastName}
+          onSuccess={() => {
+            window.location.reload();
+          }}
+        />
+
+        <Separator />
+
         {/* Logout Button */}
         <Button
           variant="destructive"
diff --git a/app/lib/api.ts b/app/lib/api.ts
index e1750e9..1304684 100644
--- a/app/lib/api.ts
+++ b/app/lib/api.ts
@@ -86,6 +86,20 @@ export const getNames = async (className: string) => {
   );
 };
 
+export const getStudentMatch = async (
+  firstName: string,
+  lastName: string,
+  classId: string
+) => {
+  return makeRequest(
+    `/api/match-student?firstName=${firstName}&lastName=${lastName}&classId=${classId}`
+  );
+};
+
+export const mergeStudent = async (studentId: string) => {
+  return makePostRequest("/api/merge-student", { studentId });
+};
+
 /**
  * === USER API ===
  */
diff --git a/public/past_classes.json b/public/past_classes.json
new file mode 100644
index 0000000..db2548d
--- /dev/null
+++ b/public/past_classes.json
@@ -0,0 +1,10 @@
+[
+  {
+    "value": "MPSI-1",
+    "label": "MPSI 1 (Sigma)"
+  },
+  {
+    "value": "MPSI-2",
+    "label": "MPSI 2 (Taupe)"
+  }
+]