diff --git a/src/identity-providers/add/DescriptorSettings.tsx b/src/identity-providers/add/DescriptorSettings.tsx
index b43df88bb9..27bed81d04 100644
--- a/src/identity-providers/add/DescriptorSettings.tsx
+++ b/src/identity-providers/add/DescriptorSettings.tsx
@@ -52,6 +52,24 @@ const Fields = ({ readOnly }: DescriptorSettingsProps) => {
 
   return (
     <div className="pf-c-form pf-m-horizontal">
+      <FormGroup
+        label={t("serviceProviderEntityId")}
+        fieldId="kc-service-provider-entity-id"
+        labelIcon={
+          <HelpItem
+            helpText="identity-providers-help:serviceProviderEntityId"
+            fieldLabelId="identity-providers:serviceProviderEntityId"
+          />
+        }
+      >
+        <TextInput
+          type="text"
+          name="config.entityId"
+          data-testid="serviceProviderEntityId"
+          id="kc-service-provider-entity-id"
+          ref={register()}
+        />
+      </FormGroup>
       <FormGroup
         label={t("ssoServiceUrl")}
         labelIcon={
diff --git a/src/identity-providers/add/SamlGeneralSettings.tsx b/src/identity-providers/add/SamlGeneralSettings.tsx
index 8097bad705..27ea5978d2 100644
--- a/src/identity-providers/add/SamlGeneralSettings.tsx
+++ b/src/identity-providers/add/SamlGeneralSettings.tsx
@@ -9,12 +9,20 @@ import { TextField } from "../component/TextField";
 import { DisplayOrder } from "../component/DisplayOrder";
 import { useParams } from "react-router";
 import type { IdentityProviderParams } from "../routes/IdentityProvider";
+import { FormattedLink } from "../../components/external-link/FormattedLink";
+import { useRealm } from "../../context/realm-context/RealmContext";
+import environment from "../../environment";
+
+import "./saml-general-settings.css";
 
 export const SamlGeneralSettings = ({ id }: { id: string }) => {
   const { t } = useTranslation("identity-providers");
+  const { realm } = useRealm();
   const { tab } = useParams<IdentityProviderParams>();
 
-  const { register, errors } = useFormContext();
+  const { register, errors, watch } = useFormContext();
+
+  const alias = watch("alias");
 
   return (
     <>
@@ -51,6 +59,23 @@ export const SamlGeneralSettings = ({ id }: { id: string }) => {
 
       <TextField field="displayName" label="displayName" />
       <DisplayOrder />
+      <FormGroup
+        label={t("endpoints")}
+        fieldId="endpoints"
+        labelIcon={
+          <HelpItem
+            helpText="identity-providers-help:alias"
+            fieldLabelId="identity-providers:alias"
+          />
+        }
+        className="keycloak__identity-providers__saml_link"
+      >
+        <FormattedLink
+          title={t("samlEndpointsLabel")}
+          href={`${environment.authUrl}/realms/${realm}/broker/${alias}/endpoint/descriptor`}
+          isInline
+        />
+      </FormGroup>
     </>
   );
 };
diff --git a/src/identity-providers/add/saml-general-settings.css b/src/identity-providers/add/saml-general-settings.css
new file mode 100644
index 0000000000..514c0ee076
--- /dev/null
+++ b/src/identity-providers/add/saml-general-settings.css
@@ -0,0 +1,3 @@
+.keycloak__identity-providers__saml_link > .pf-c-form__group-control {
+  padding-top: var(--pf-c-form--m-horizontal__group-label--md--PaddingTop);
+}
\ No newline at end of file
diff --git a/src/identity-providers/help.ts b/src/identity-providers/help.ts
index 439cf459c3..cb130b74de 100644
--- a/src/identity-providers/help.ts
+++ b/src/identity-providers/help.ts
@@ -10,6 +10,7 @@ export default {
       "The client secret registered with the identity provider. This field is able to obtain its value from vault, use ${vault.ID} format.",
     displayOrder:
       "Number defining the order of the providers in GUI (for example, on the Login page). The lowest number will be applied first.",
+    endpoints: "Shows the configuration of the Service Provider endpoint",
     useDiscoveryEndpoint:
       "If this setting is enabled, the discovery endpoint will be used to fetch the provider config. Keycloak can load the config from the endpoint and automatically update the config if the source has any updates",
     discoveryEndpoint:
diff --git a/src/identity-providers/messages.ts b/src/identity-providers/messages.ts
index 71063aadcb..c265844827 100644
--- a/src/identity-providers/messages.ts
+++ b/src/identity-providers/messages.ts
@@ -39,6 +39,8 @@ export default {
     clientId: "Client ID",
     clientSecret: "Client Secret",
     displayOrder: "Display order",
+    endpoints: "Endpoints",
+    samlEndpointsLabel: "SAML 2.0 Service Provider Metadata",
     createSuccess: "Identity provider successfully created",
     createError: "Could not create the identity provider: {{error}}",
     orderDialogIntro: