diff --git a/apps/console/src/features/organization-discovery/components/add-organization-discovery-domains.tsx b/apps/console/src/features/organization-discovery/components/add-organization-discovery-domains.tsx
index efde92a85d5..4e32141b5b0 100644
--- a/apps/console/src/features/organization-discovery/components/add-organization-discovery-domains.tsx
+++ b/apps/console/src/features/organization-discovery/components/add-organization-discovery-domains.tsx
@@ -24,6 +24,7 @@ import Chip from "@oxygen-ui/react/Chip";
 import FormHelperText from "@oxygen-ui/react/FormHelperText";
 import InputLabel from "@oxygen-ui/react/InputLabel";
 import TextField from "@oxygen-ui/react/TextField";
+import { hasRequiredScopes } from "@wso2is/core/helpers";
 import {
     AlertLevels,
     IdentifiableComponentInterface,
@@ -39,13 +40,13 @@ import {
 } from "@wso2is/form";
 import { EmphasizedSegment, Hint, PrimaryButton } from "@wso2is/react-components";
 import isEmpty from "lodash-es/isEmpty";
-import React, { FunctionComponent, ReactElement, SyntheticEvent, useMemo, useState } from "react";
+import React, { FunctionComponent, ReactElement, SyntheticEvent, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { Dispatch } from "redux";
+import { AppState, FeatureConfigInterface } from "../../core";
 import { AppConstants } from "../../core/constants/app-constants";
 import { history } from "../../core/helpers/history";
-import { FeatureConfigInterface } from "../../core/models/config";
 import useGetOrganizations from "../../organizations/api/use-get-organizations";
 import { OrganizationInterface } from "../../organizations/models/organizations";
 import addOrganizationEmailDomain from "../api/add-organization-email-domains";
@@ -90,17 +91,35 @@ const FORM_ID: string = "edit-organization-email-domains-form";
 const AddOrganizationDiscoveryDomains: FunctionComponent<AddOrganizationDiscoveryDomainsPropsInterface> = (
     props: AddOrganizationDiscoveryDomainsPropsInterface
 ): ReactElement => {
-    const { ["data-componentid"]: componentId } = props;
+    const { 
+        isReadOnly,
+        ["data-componentid"]: componentId
+    } = props;
 
     const { t } = useTranslation();
 
     const dispatch: Dispatch = useDispatch();
 
+    const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
+    const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state.config.ui.features);
+
     const { data: organizations } = useGetOrganizations(true, null, null, null, null, true);
 
     const { data: discoverableOrganizations } = useGetOrganizationDiscovery(true, null, null, null);
 
     const [ emailDomains, setEmailDomains ] = useState<string[]>([]);
+    const [ hasScopes, setHasScopes ] = useState(false);
+
+    /**
+     * Set the hasScopes state based on the feature config.
+     */
+    useEffect(() => {
+        setHasScopes(
+            !hasRequiredScopes(
+                featureConfig?.organizationDiscovery,
+                featureConfig?.organizationDiscovery?.scopes?.update,
+                allowedScopes));
+    }, [ featureConfig ]);
 
     /**
      * Filter the already configured organizations from the list of organizations.
@@ -273,17 +292,19 @@ const AddOrganizationDiscoveryDomains: FunctionComponent<AddOrganizationDiscover
                             </FormHelperText>
                             <FormSpy subscription={ { values: true } }>
                                 { ({ values }: { values: AddOrganizationDiscoveryDomainsFormValuesInterface }) => (
-                                    <PrimaryButton
-                                        data-componentid={ `${componentId}-form-submit-button` }
-                                        disabled={
-                                            submitting || isEmpty(emailDomains) || isEmpty(values?.organizationName)
-                                        }
-                                        loading={ submitting }
-                                        type="submit"
-                                        style={ { marginTop: "20px" } }
-                                    >
-                                        { t("common:update") }
-                                    </PrimaryButton>
+                                    !isReadOnly && !hasScopes && (
+                                        <PrimaryButton
+                                            data-componentid={ `${componentId}-form-submit-button` }
+                                            disabled={
+                                                submitting || isEmpty(emailDomains) || isEmpty(values?.organizationName)
+                                            }
+                                            loading={ submitting }
+                                            type="submit"
+                                            style={ { marginTop: "20px" } }
+                                        >
+                                            { t("console:manage.features.organizationDiscovery.assign.buttons.assign") }
+                                        </PrimaryButton>
+                                    )
                                 ) }
                             </FormSpy>
                         </form>
diff --git a/apps/console/src/features/organization-discovery/components/discoverable-organizations-list.tsx b/apps/console/src/features/organization-discovery/components/discoverable-organizations-list.tsx
index f2a7fe4e24f..24603eb37a4 100644
--- a/apps/console/src/features/organization-discovery/components/discoverable-organizations-list.tsx
+++ b/apps/console/src/features/organization-discovery/components/discoverable-organizations-list.tsx
@@ -253,7 +253,7 @@ const DiscoverableOrganizationsList: FunctionComponent<DiscoverableOrganizations
                         t("console:manage.placeholders.emptySearchResult.subtitles.0", {
                             // searchQuery looks like "name co OrganizationName", so we only remove the filter string
                             // only to get the actual user entered query
-                            query: searchQuery.split("organizationName co ")[1]
+                            query: searchQuery.split(" ").pop()
                         }),
                         t("console:manage.placeholders.emptySearchResult.subtitles.1")
                     ] }
diff --git a/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx b/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
index 6b2eb57141b..7da667205f1 100644
--- a/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
+++ b/apps/console/src/features/organization-discovery/components/edit-organization-discovery-domains.tsx
@@ -24,6 +24,7 @@ import Chip from "@oxygen-ui/react/Chip";
 import FormHelperText from "@oxygen-ui/react/FormHelperText";
 import InputLabel from "@oxygen-ui/react/InputLabel";
 import TextField from "@oxygen-ui/react/TextField";
+import { hasRequiredScopes } from "@wso2is/core/helpers";
 import {
     AlertLevels,
     IdentifiableComponentInterface,
@@ -34,9 +35,9 @@ import { FinalForm, FinalFormField, FormRenderProps, TextFieldAdapter } from "@w
 import { ContentLoader, EmphasizedSegment, Hint, PrimaryButton } from "@wso2is/react-components";
 import React, { FunctionComponent, ReactElement, SyntheticEvent, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { Dispatch } from "redux";
-import { FeatureConfigInterface } from "../../core";
+import { AppState, FeatureConfigInterface } from "../../core";
 import updateOrganizationDiscoveryAttributes from "../api/update-organization-email-domains";
 import {
     OrganizationDiscoveryAttributeDataInterface,
@@ -101,7 +102,11 @@ const EditOrganizationDiscoveryDomains: FunctionComponent<EditOrganizationDiscov
 
     const dispatch: Dispatch<any> = useDispatch();
 
+    const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
+    const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state.config.ui.features);
+
     const [ emailDomains, setEmailDomains ] = useState<string[]>([]);
+    const [ hasScopes, setHasScopes ] = useState(false);
 
     const optionsArray: string[] = [];
 
@@ -113,6 +118,17 @@ const EditOrganizationDiscoveryDomains: FunctionComponent<EditOrganizationDiscov
         setEmailDomains(organizationDiscoveryAttributes?.attributes[0]?.values ?? []);
     }, [ organizationDiscoveryAttributes ]);
 
+    /**
+     * Set the hasScopes state based on the feature config.
+     */
+    useEffect(() => {
+        setHasScopes(
+            !hasRequiredScopes(
+                featureConfig?.organizationDiscovery,
+                featureConfig?.organizationDiscovery?.scopes?.update,
+                allowedScopes));
+    }, [ featureConfig, organization ]);
+
     /**
      * Function to handle the form submit action.
      *
@@ -264,7 +280,7 @@ const EditOrganizationDiscoveryDomains: FunctionComponent<EditOrganizationDiscov
                                     ) }
                                 </Hint>
                             </FormHelperText>
-                            { !isReadOnly && (
+                            { !isReadOnly && !hasScopes && (
                                 <PrimaryButton
                                     data-componentid={ `${componentId}-form-save-button` }
                                     disabled={ submitting }
diff --git a/modules/i18n/src/models/namespaces/console-ns.ts b/modules/i18n/src/models/namespaces/console-ns.ts
index d90b7573085..0e85a85e88b 100644
--- a/modules/i18n/src/models/namespaces/console-ns.ts
+++ b/modules/i18n/src/models/namespaces/console-ns.ts
@@ -3285,6 +3285,9 @@ export interface ConsoleNS {
                                 hint: string;
                             }
                         }
+                    },
+                    buttons: {
+                        assign: string;
                     }
                 },
                 emailDomains: {
diff --git a/modules/i18n/src/translations/en-US/portals/console.ts b/modules/i18n/src/translations/en-US/portals/console.ts
index 7f06f8c74e5..04a5bc73d9d 100644
--- a/modules/i18n/src/translations/en-US/portals/console.ts
+++ b/modules/i18n/src/translations/en-US/portals/console.ts
@@ -9390,6 +9390,9 @@ export const console: ConsoleNS = {
                                 hint: "Enter the name of the organization you wish to add the domain mapping."
                             }
                         }
+                    },
+                    buttons: {
+                        assign: "Assign"
                     }
                 },
                 emailDomains: {
@@ -9422,56 +9425,56 @@ export const console: ConsoleNS = {
                             message: "Adding unsuccessful"
                         },
                         success: {
-                            description: "Email domains added successfully",
+                            description: "Email domains added successfully.",
                             message: "Added successfully"
                         }
                     },
                     disableEmailDomainDiscovery: {
                         error: {
-                            description: "An error occurred while disabling email domain discovery",
+                            description: "An error occurred while disabling email domain discovery.",
                             message: "Disabling unsuccessful"
                         },
                         success: {
-                            description: "Successfully disabled email domain discovery",
+                            description: "Successfully disabled email domain discovery.",
                             message: "Disabled successfully"
                         }
                     },
                     enableEmailDomainDiscovery: {
                         error: {
-                            description: "An error occurred while enabling email domain discovery",
+                            description: "An error occurred while enabling email domain discovery.",
                             message: "Enabling unsuccessful"
                         },
                         success: {
-                            description: "Successfully enabled email domain discovery",
+                            description: "Successfully enabled email domain discovery.",
                             message: "Enabled successfully"
                         }
                     },
                     fetchOrganizationDiscoveryAttributes: {
                         error: {
-                            description: "An error occurred while fetching the organization discovery attributes",
+                            description: "An error occurred while fetching the organization discovery attributes.",
                             message: "Retrieval unsuccessful"
                         }
                     },
                     getEmailDomainDiscovery: {
                         error: {
-                            description: "An error occurred while retrieving email domain discovery configuration",
+                            description: "An error occurred while retrieving email domain discovery configuration.",
                             message: "Retrieval unsuccessful"
                         }
                     },
                     getOrganizationListWithDiscovery: {
                         error: {
-                            description: "An error occurred while getting the organization list with discovery attributes",
+                            description: "An error occurred while getting the organization list with discovery attributes.",
                             message: "Retrieval unsuccessful"
                         }
                     },
                     updateOrganizationDiscoveryAttributes: {
                         error: {
-                            description: "An error occurred while updating the organization discovery attributes",
-                            message: "Updated unsuccessful"
+                            description: "An error occurred while updating the organization discovery attributes.",
+                            message: "Update unsuccessful"
                         },
                         success: {
-                            description: "Successfully updated the organization discovery attributes",
-                            message: "Updated successful"
+                            description: "Successfully updated the organization discovery attributes.",
+                            message: "Update successful"
                         }
                     }
                 },
diff --git a/modules/i18n/src/translations/fr-FR/portals/console.ts b/modules/i18n/src/translations/fr-FR/portals/console.ts
index 782daa5f1d6..0c922029170 100755
--- a/modules/i18n/src/translations/fr-FR/portals/console.ts
+++ b/modules/i18n/src/translations/fr-FR/portals/console.ts
@@ -7619,6 +7619,9 @@ export const console: ConsoleNS = {
                                 hint: "Entrez le nom de l'organisation que vous souhaitez ajouter le mappage de domaine."
                             }
                         }
+                    },
+                    buttons: {
+                        assign: "Attribuer"
                     }
                 },
                 emailDomains: {
@@ -7648,59 +7651,59 @@ export const console: ConsoleNS = {
                     addEmailDomains: {
                         error: {
                             description: "L'ajout des domaines de messagerie à l'organisation a échoué.",
-                            message: "Impossible d'ajouter des domaines de messagerie"
+                            message: "Ajout échoué"
                         },
                         success: {
-                            description: "Les domaines de messagerie ajoutés avec succès",
-                            message: "Ajout avec succès les domaines de messagerie à l'organisation."
+                            description: "Domaines de messagerie ajoutés avec succès.",
+                            message: "Ajouté avec succès"
                         }
                     },
                     disableEmailDomainDiscovery: {
                         error: {
-                            description: "Erreur lors de la désactivation de la découverte de domaine de messagerie",
-                            message: "Quelque chose s'est mal passé"
+                            description: "Une erreur s'est produite lors de la désactivation de la découverte de domaines de messagerie.",
+                            message: "Désactivation échouée"
                         },
                         success: {
-                            description: "La découverte du domaine de messagerie a été désactivée avec succès",
-                            message: "La découverte du domaine de messagerie a été désactivée avec succès"
+                            description: "La découverte du domaine de messagerie a été désactivée avec succès.",
+                            message: "Désactivé avec succès"
                         }
                     },
                     enableEmailDomainDiscovery: {
                         error: {
-                            description: "Une erreur s'est produite lors de l'activation de la découverte de domaines de messagerie",
-                            message: "Quelque chose s'est mal passé"
+                            description: "Une erreur s'est produite lors de l'activation de la découverte de domaines de messagerie.",
+                            message: "Activation échouée"
                         },
                         success: {
-                            description: "La découverte du domaine de messagerie a été activée avec succès",
-                            message: "La découverte du domaine de messagerie a été activée avec succès"
+                            description: "La découverte du domaine de messagerie a été activée avec succès.",
+                            message: "Activé avec succès"
                         }
                     },
                     fetchOrganizationDiscoveryAttributes: {
                         error: {
-                            description: "Une erreur s'est produite lors de la récupération des attributs de découverte de l'organisation",
-                            message: "Quelque chose s'est mal passé"
+                            description: "Une erreur s'est produite lors de la récupération des attributs de découverte de l'organisation.",
+                            message: "Récupération échouée"
                         }
                     },
                     getEmailDomainDiscovery: {
                         error: {
-                            description: "Une erreur s'est produite lors de la récupération de la configuration de la découverte du domaine de messagerie",
-                            message: "Quelque chose s'est mal passé"
+                            description: "Une erreur s'est produite lors de la récupération de la configuration de la découverte du domaine de messagerie.",
+                            message: "Récupération échouée"
                         }
                     },
                     getOrganizationListWithDiscovery: {
                         error: {
-                            description: "Une erreur s'est produite lors de l'obtention de la liste des organisations avec les attributs de découverte",
-                            message: "Quelque chose s'est mal passé"
+                            description: "Une erreur s'est produite lors de l'obtention de la liste des organisations avec les attributs de découverte.",
+                            message: "Récupération échouée"
                         }
                     },
                     updateOrganizationDiscoveryAttributes: {
                         error: {
-                            description: "Une erreur s'est produite lors de la mise à jour des attributs de découverte de l'organisation",
-                            message: "Quelque chose s'est mal passé"
+                            description: "Une erreur s'est produite lors de la mise à jour des attributs de découverte de l'organisation.",
+                            message: "Échec de la mise à jour"
                         },
                         success: {
-                            description: "Mise à jour réussie des attributs de découverte de l'organisation",
-                            message: "Attributs de découverte d'organisation mis à jour avec succès"
+                            description: "Mise à jour réussie des attributs de découverte de l'organisation.",
+                            message: "Mise à jour réussie"
                         }
                     }
                 },
diff --git a/modules/i18n/src/translations/si-LK/portals/console.ts b/modules/i18n/src/translations/si-LK/portals/console.ts
index f12ccb75219..ed36fe958f8 100755
--- a/modules/i18n/src/translations/si-LK/portals/console.ts
+++ b/modules/i18n/src/translations/si-LK/portals/console.ts
@@ -7460,6 +7460,9 @@ export const console: ConsoleNS = {
                                 hint: "වසම් සිතියම්කරණය එකතු කිරීමට ඔබ කැමති සංවිධානයේ නම ඇතුළත් කරන්න."
                             }
                         }
+                    },
+                    buttons: {
+                        assign: "පැවරීම"
                     }
                 },
                 emailDomains: {
@@ -7488,60 +7491,60 @@ export const console: ConsoleNS = {
                 notifications: {
                     addEmailDomains: {
                         error: {
-                            description: "සංවිධානයට විද්යුත් තැපැල් වසම් එකතු කිරීම අසාර්ථක විය.",
-                            message: "ඊමේල් වසම් එකතු කිරීමට නොහැකි විය"
+                            description: "සංවිධානයට ඊමේල් වසම් එක් කිරීම අසාර්ථක විය.",
+                            message: "එකතු කිරීම අසාර්ථකයි"
                         },
                         success: {
-                            description: "ඊමේල් වසම් සාර්ථකව එකතු කරන ලදි",
-                            message: "සංවිධානයට විද්යුත් තැපැල් වසම් සාර්ථකව එක් කළේය."
+                            description: "විද්‍යුත් තැපැල් වසම් සාර්ථකව එකතු කරන ලදී.",
+                            message: "සාර්ථකව එකතු කරන ලදි"
                         }
                     },
                     disableEmailDomainDiscovery: {
                         error: {
-                            description: "විද්‍යුත් තැපැල් වසම් සොයාගැනීම අක්‍රිය කිරීමේදී දෝෂයක් ඇති විය",
-                            message: "මොකක්හරි වැරැද්දක් වෙලා"
+                            description: "විද්‍යුත් තැපැල් වසම් සොයාගැනීම අක්‍රිය කිරීමේදී දෝෂයක් ඇති විය.",
+                            message: "අබල කිරීම අසාර්ථකයි"
                         },
                         success: {
-                            description: "විද්‍යුත් තැපැල් වසම් සොයා ගැනීම සාර්ථකව අක්‍රීය කරන ලදී",
-                            message: "විද්‍යුත් තැපෑල වසම් සොයා ගැනීම සාර්ථකව අක්‍රීය කර ඇත"
+                            description: "විද්‍යුත් තැපැල් වසම් සොයා ගැනීම සාර්ථකව අක්‍රීය කරන ලදී.",
+                            message: "සාර්ථකව අක්‍රියයි"
                         }
                     },
                     enableEmailDomainDiscovery: {
                         error: {
-                            description: "විද්‍යුත් තැපෑල වසම් සොයාගැනීම සබල කිරීමේදී දෝෂයක් ඇති විය",
-                            message: "මොකක්හරි වැරැද්දක් වෙලා"
+                            description: "විද්‍යුත් තැපෑල වසම් සොයාගැනීම සබල කිරීමේදී දෝෂයක් ඇති විය.",
+                            message: "සබල කිරීම අසාර්ථකයි"
                         },
                         success: {
-                            description: "විද්‍යුත් තැපැල් වසම් සොයාගැනීම සාර්ථකව සක්‍රීය කර ඇත",
-                            message: "විද්‍යුත් තැපැල් වසම් සොයා ගැනීම සාර්ථකව සක්‍රීය කර ඇත"
+                            description: "විද්‍යුත් තැපැල් වසම් සොයාගැනීම සාර්ථකව සක්‍රීය කර ඇත.",
+                            message: "සාර්ථකව සබල කර ඇත"
                         }
                     },
                     fetchOrganizationDiscoveryAttributes: {
                         error: {
-                            description: "සංවිධානයේ සොයාගැනීම් ගුණාංග ලබා ගැනීමේදී දෝෂයක් ඇති විය",
-                            message: "මොකක්හරි වැරැද්දක් වෙලා"
+                            description: "සංවිධානයේ සොයාගැනීම් ගුණාංග ලබා ගැනීමේදී දෝෂයක් ඇති විය.",
+                            message: "ලබා ගැනීම අසාර්ථකයි"
                         }
                     },
                     getEmailDomainDiscovery: {
                         error: {
-                            description: "ඊමේල් වසම් සොයාගැනීමේ වින්‍යාසය ලබා ගැනීමේදී දෝෂයක් ඇති විය",
-                            message: "මොකක්හරි වැරැද්දක් වෙලා"
+                            description: "ඊමේල් වසම් සොයාගැනීමේ වින්‍යාසය ලබා ගැනීමේදී දෝෂයක් ඇති විය.",
+                            message: "Retrieval unsuccessful"
                         }
                     },
                     getOrganizationListWithDiscovery: {
                         error: {
-                            description: "සොයාගැනීම් ගුණාංග සහිත සංවිධාන ලැයිස්තුව ලබා ගැනීමේදී දෝෂයක් ඇති විය",
-                            message: "මොකක්හරි වැරැද්දක් වෙලා"
+                            description: "An error occurred while getting the organization list with discovery attributes.",
+                            message: "ලබා ගැනීම අසාර්ථකයි"
                         }
                     },
                     updateOrganizationDiscoveryAttributes: {
                         error: {
-                            description: "සංවිධානයේ සොයාගැනීම් ගුණාංග යාවත්කාලීන කිරීමේදී දෝෂයක් ඇති විය",
-                            message: "මොකක්හරි වැරැද්දක් වෙලා"
+                            description: "සංවිධානයේ සොයාගැනීම් ගුණාංග යාවත්කාලීන කිරීමේදී දෝෂයක් ඇති විය.",
+                            message: "යාවත්කාලීන කිරීම අසාර්ථකයි"
                         },
                         success: {
-                            description: "සංවිධානයේ සොයාගැනීම් උපලක්ෂණ සාර්ථකව යාවත්කාලීන කරන ලදී",
-                            message: "සංවිධානයේ සොයාගැනීම් උපලක්ෂණ සාර්ථකව යාවත්කාලීන කරන ලදී"
+                            description: "සංවිධානයේ සොයාගැනීම් උපලක්ෂණ සාර්ථකව යාවත්කාලීන කරන ලදී.",
+                            message: "යාවත්කාලීන කිරීම සාර්ථකයි"
                         }
                     }
                 },