diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
index 22d3f343..6c0ec9c9 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatus.vue
@@ -58,8 +58,8 @@
                   "
                 >
                   {{
-                    studentGradStatus.schoolName
-                      ? studentGradStatus.schoolName
+                    studentGradStatus.schoolOfRecordName
+                      ? studentGradStatus.schoolOfRecordName
                       : schoolOfRecord.displayName
                   }}<br />
                   {{ studentGradStatus.schoolOfRecord }}
diff --git a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
index 0a234acf..097d9a2a 100644
--- a/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
+++ b/frontend/src/components/StudentProfile/GraduationStatus/GRADStatusForm.vue
@@ -317,12 +317,12 @@
                     }}
                   </div>
                   <v-autocomplete
-                    v-model="editedGradStatus.schoolOfRecord"
+                    v-model="editedGradStatus.schoolOfRecordId"
                     :disabled="disableSchoolOfRecord"
                     label="Select a school"
                     :items="getSchoolsList"
                     :item-title="schoolTitle"
-                    item-value="mincode"
+                    item-value="schoolId"
                     variant="outlined"
                     density="compact"
                     class="mt-4"
@@ -352,13 +352,12 @@
                         .$message
                     }}
                   </div>
-                  <!--    :disabled="disableSchoolAtGrad" -->
                   <v-autocomplete
-                    v-model="editedGradStatus.schoolAtGrad"
+                    v-model="editedGradStatus.schoolAtGradId"
                     label="Select a school"
                     :items="getSchoolsList"
                     :item-title="schoolTitle"
-                    item-value="mincode"
+                    item-value="schoolId"
                     variant="outlined"
                     class="mt-4"
                     density="compact"
@@ -918,10 +917,15 @@ export default {
       this.editedGradStatus.pen = this.studentGradStatus.pen;
       this.editedGradStatus.program = this.studentGradStatus.program;
       this.editedGradStatus.studentGrade = this.studentGradStatus.studentGrade;
-      this.editedGradStatus.schoolName = this.studentGradStatus.schoolName;
+      this.editedGradStatus.schoolOfRecordName =
+        this.studentGradStatus.schoolOfRecordName;
       this.editedGradStatus.schoolOfRecord =
         this.studentGradStatus.schoolOfRecord;
+      this.editedGradStatus.schoolOfRecordId =
+        this.studentGradStatus.schoolOfRecordId;
       this.editedGradStatus.schoolAtGrad = this.studentGradStatus.schoolAtGrad;
+      this.editedGradStatus.schoolAtGradId =
+        this.studentGradStatus.schoolAtGradId;
       this.editedGradStatus.schoolAtGradName =
         this.studentGradStatus.schoolAtGradName;
       this.editedGradStatus.studentStatus =
diff --git a/frontend/src/store/modules/student.js b/frontend/src/store/modules/student.js
index 7175a310..ba79d963 100644
--- a/frontend/src/store/modules/student.js
+++ b/frontend/src/store/modules/student.js
@@ -48,9 +48,11 @@ export const useStudentStore = defineStore("student", {
       pen: "",
       program: "",
       studentGrade: "",
-      schoolName: "",
+      schoolOfRecordName: "",
       schoolOfRecord: "",
+      schoolOfRecordId: "",
       schoolAtGrad: "",
+      schoolAtGradId: "",
       schoolAtGradName: "",
       studentStatus: "",
       studentID: "",