diff --git a/backend/api/models/MentorProfile.py b/backend/api/models/MentorProfile.py
index 510141c01..82a88200a 100644
--- a/backend/api/models/MentorProfile.py
+++ b/backend/api/models/MentorProfile.py
@@ -33,6 +33,7 @@ class MentorProfile(Document, Mixin):
     pair_partner = DictField(required=False)
     preferred_language = StringField(required=False, default="en-US")
     roomName = StringField(required=False)
+    organization = StringField(required=False)
 
     def __repr__(self):
         return f"""<MentorProfile firebase_id: {self.firebase_uid} 
diff --git a/backend/api/models/NewMentorApplication.py b/backend/api/models/NewMentorApplication.py
index 41cdcb376..3810af61d 100644
--- a/backend/api/models/NewMentorApplication.py
+++ b/backend/api/models/NewMentorApplication.py
@@ -32,6 +32,7 @@ class NewMentorApplication(Document, Mixin):
     notes = StringField()
     traingStatus = DictField(required=False)
     specializations = ListField(StringField(), required=False)
+    partner = StringField()
 
     def __repr__(self):
         return f"""<Mentor Application email: {self.email}
diff --git a/backend/api/utils/profile_parse.py b/backend/api/utils/profile_parse.py
index d84231e0e..a2b9d61d4 100644
--- a/backend/api/utils/profile_parse.py
+++ b/backend/api/utils/profile_parse.py
@@ -44,6 +44,7 @@ def new_profile(data: dict = {}, profile_type: int = -1):
             firebase_uid=data["firebase_uid"],
             name=data["name"],
             email=data["email"],
+            organization=data["organization"],
             professional_title=data["professional_title"],
             specializations=data["specializations"],
             offers_in_person=data.get("offers_in_person", False),
@@ -175,6 +176,8 @@ def edit_profile(data: dict = {}, profile: object = None):
         return True
 
     if isinstance(profile, MentorProfile):
+        ex_organization = profile.organization
+        profile.organization = data.get("organization", profile.organization)
         # Edit fields or keep original data if no added data
         profile.professional_title = data.get(
             "professional_title", profile.professional_title
@@ -191,6 +194,37 @@ def edit_profile(data: dict = {}, profile: object = None):
         )
         profile.linkedin = data.get("linkedin", profile.linkedin)
         profile.website = data.get("website", profile.website)
+
+        if ex_organization != profile.organization:
+            # for old data---------------------------------
+            pair_partner_data = PartnerProfile.objects(
+                assign_mentors__in=[{"id": str(profile.id), "name": profile.name}]
+            )
+            for wrong_partner_item in pair_partner_data:
+                assign_mentors = []
+                for mentee_item in wrong_partner_item.assign_mentors:
+                    mentee_item_id = None
+                    if "id" in mentee_item:
+                        mentee_item_id = str(mentee_item["id"])
+                    if mentee_item_id is not None and mentee_item_id != str(profile.id):
+                        assign_mentors.append(mentee_item)
+
+                wrong_partner_item.assign_mentors = assign_mentors
+                wrong_partner_item.save()
+            # -------------------------------------------------------------------------
+            if profile.organization is not None and profile.organization != 0:
+                partenr_account = PartnerProfile.objects.get(id=profile.organization)
+                if partenr_account is not None:
+                    assign_mentors = []
+                    if partenr_account.assign_mentors:
+                        assign_mentors = partenr_account.assign_mentors
+                    assign_mentors.append({"id": str(profile.id), "name": profile.name})
+                    partenr_account.assign_mentors = assign_mentors
+                    partenr_account.save()
+
+        if profile.organization == 0:
+            profile.organization = None
+
         if "video" in data and data.get("video") is not None:
             video_data = data.get("video")
             if video_data:
diff --git a/backend/api/views/apply.py b/backend/api/views/apply.py
index fae117965..327aa9d97 100644
--- a/backend/api/views/apply.py
+++ b/backend/api/views/apply.py
@@ -548,6 +548,9 @@ def create_application():
                 status=422, message="This user is already registered"
             )
         else:
+            partner = data.get("partner")
+            if partner == 0:
+                partner = None
             new_application = NewMentorApplication(
                 name=data.get("name"),
                 email=data.get("email"),
@@ -570,6 +573,7 @@ def create_application():
                 specialistTime=data.get("specialistTime"),
                 application_state="PENDING",
                 specializations=data.get("specializations"),
+                partner=partner,
             )
 
     if role == Account.MENTEE:
diff --git a/backend/api/views/main.py b/backend/api/views/main.py
index 37267782f..1ce2679e8 100644
--- a/backend/api/views/main.py
+++ b/backend/api/views/main.py
@@ -364,6 +364,19 @@ def create_mentor_profile():
     data["firebase_uid"] = firebase_uid
     new_account.firebase_uid = firebase_uid
     new_account.save()
+    if account_type == Account.MENTOR:
+        mentor_partenr_id = data.get("organization")
+        if mentor_partenr_id is not None and mentor_partenr_id != 0:
+            partenr_account = PartnerProfile.objects.get(id=mentor_partenr_id)
+            if partenr_account is not None:
+                assign_mentors = []
+                if partenr_account.assign_mentors:
+                    assign_mentors = partenr_account.assign_mentors
+                assign_mentors.append(
+                    {"id": str(new_account.id), "name": new_account.name}
+                )
+                partenr_account.assign_mentors = assign_mentors
+                partenr_account.save()
     if account_type == Account.MENTEE:
         mentee_partenr_id = data.get("organization")
         if mentee_partenr_id is not None and mentee_partenr_id != 0:
@@ -390,11 +403,11 @@ def create_mentor_profile():
         if app_data is not None:
             app_data.application_state = "COMPLETED"
             app_data.save()
-    if account_type == Account.MENTOR:
-        app_data = MentorApplication.objects.get(email=email)
-        if app_data is not None:
-            app_data.application_state = "COMPLETED"
-            app_data.save()
+    # if account_type == Account.MENTOR:
+    #     app_data = MentorApplication.objects.get(email=email)
+    #     if app_data is not None:
+    #         app_data.application_state = "COMPLETED"
+    #         app_data.save()
 
     if account_type != Account.PARTNER:
         try:
diff --git a/frontend/src/components/pages/MentorApplication.js b/frontend/src/components/pages/MentorApplication.js
index 0881682b5..30886cb17 100644
--- a/frontend/src/components/pages/MentorApplication.js
+++ b/frontend/src/components/pages/MentorApplication.js
@@ -1,8 +1,8 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Button, Form, Input, Radio, Typography, Select } from "antd";
 import { useTranslation } from "react-i18next";
-import { createApplication } from "utils/api";
-import { phoneRegex, validatePhoneNumber } from "utils/misc";
+import { createApplication, fetchPartners } from "utils/api";
+import { phoneRegex } from "utils/misc";
 import { useSelector } from "react-redux";
 
 const { Paragraph } = Typography;
@@ -13,6 +13,28 @@ function MentorApplication({ email, role, onSubmitFailure, onSubmitSuccess }) {
   const { t } = useTranslation();
   const [loading, setloading] = useState(false);
   const options = useSelector((state) => state.options);
+  const [partnerOptions, setPartnerOptions] = useState([]);
+
+  useEffect(() => {
+    async function getPartners() {
+      const partenr_data = await fetchPartners(undefined, null);
+      var temp_partner_options = [];
+      partenr_data.map((item) => {
+        temp_partner_options.push({
+          value: item._id.$oid,
+          label: item.organization,
+        });
+        return true;
+      });
+      temp_partner_options.push({
+        value: null,
+        label: t("commonApplication.no-affiliation"),
+      });
+      setPartnerOptions(temp_partner_options);
+      setloading(false);
+    }
+    getPartners();
+  }, []);
 
   const onFinish = async (values) => {
     setloading(true);
@@ -37,6 +59,8 @@ function MentorApplication({ email, role, onSubmitFailure, onSubmitSuccess }) {
       pastLiveLocation: values.previousLocations,
       date_submitted: new Date(),
       specializations: values.specializations,
+      organization: values.organization,
+      partner: values.partner,
       role,
     };
     const res = await createApplication(data);
@@ -375,6 +399,24 @@ function MentorApplication({ email, role, onSubmitFailure, onSubmitSuccess }) {
             tokenSeparators={[","]}
           />
         </Form.Item>
+        <Form.Item
+          label={t("commonApplication.partner")}
+          name="partner"
+          rules={[
+            {
+              required: false,
+              message: t("common.requiredPartner"),
+            },
+          ]}
+        >
+          <Select
+            showSearch
+            filterOption={(input, option) =>
+              (option?.label.toLowerCase() ?? "").includes(input.toLowerCase())
+            }
+            options={[...partnerOptions]}
+          />
+        </Form.Item>
         <Form.Item>
           <Button
             id="submit"
diff --git a/frontend/src/components/pages/MentorProfileForm.js b/frontend/src/components/pages/MentorProfileForm.js
index 6149d2c3a..323e70218 100644
--- a/frontend/src/components/pages/MentorProfileForm.js
+++ b/frontend/src/components/pages/MentorProfileForm.js
@@ -20,6 +20,7 @@ import moment from "moment";
 import ImgCrop from "antd-img-crop";
 import { UserOutlined, EditFilled } from "@ant-design/icons";
 import { css } from "@emotion/css";
+import { fetchPartners } from "utils/api";
 
 const styles = {
   formGroup: css`
@@ -53,15 +54,50 @@ function MentorProfileForm({
   const [changedImage, setChangedImage] = useState(false);
   const [edited, setEdited] = useState(false);
   const [form] = Form.useForm();
+  const [partnerOptions, setPartnerOptions] = useState([]);
+  const [flag, setFlag] = useState(false);
+
+  useEffect(() => {
+    async function getPartners() {
+      const partenr_data = await fetchPartners(undefined, null);
+      if (!(partnerOptions.length > 0)) {
+        partenr_data.map((item) => {
+          partnerOptions.push({
+            value: item._id.$oid,
+            label: item.organization,
+          });
+          return true;
+        });
+        partnerOptions.push({
+          value: null,
+          label: t("commonApplication.no-affiliation"),
+        });
+        setPartnerOptions(partnerOptions);
+        setFlag(!flag);
+      }
+    }
+
+    getPartners();
+  }, []);
 
   useEffect(() => {
     if (profileData) {
       form.setFieldsValue(profileData);
       form.setFieldValue("video", profileData.video?.url);
       setImage(profileData.image);
+
+      if (profileData.organization == 0) {
+        form.setFieldValue("organization", null);
+      }
     }
-    if (applicationData && applicationData.specializations) {
-      form.setFieldValue("specializations", applicationData.specializations);
+    if (applicationData) {
+      if (applicationData.specializations) {
+        form.setFieldValue("specializations", applicationData.specializations);
+      }
+      form.setFieldValue(
+        "organization",
+        applicationData.partner ? applicationData.partner : null
+      );
     }
   }, [profileData, form, resetFields, applicationData]);
 
@@ -416,6 +452,19 @@ function MentorProfileForm({
           tokenSeparators={[","]}
         />
       </Form.Item>
+      <Form.Item
+        label={t("menteeProfile.organizationAffiliation")}
+        name="organization"
+        rules={[
+          {
+            required: false,
+            message: t("common.requiredOrganizationAffiliation"),
+          },
+        ]}
+        className={styles.formGroupItem}
+      >
+        <Select options={[...partnerOptions]} />
+      </Form.Item>
       <Typography.Title level={4}>
         {t("commonProfile.education")}
       </Typography.Title>