From 4674a0b5336c72aaa09c0f3495551b2d8508ea08 Mon Sep 17 00:00:00 2001
From: Yasasr1 <yasasramanayaka@gmail.com>
Date: Tue, 18 Jun 2024 17:29:12 +0530
Subject: [PATCH 1/2] skip custom domains for console and my account.

---
 .../src/main/webapp/includes/init-url.jsp                 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/identity-apps-core/apps/authentication-portal/src/main/webapp/includes/init-url.jsp b/identity-apps-core/apps/authentication-portal/src/main/webapp/includes/init-url.jsp
index b1862e2da5b..7ac334648c4 100755
--- a/identity-apps-core/apps/authentication-portal/src/main/webapp/includes/init-url.jsp
+++ b/identity-apps-core/apps/authentication-portal/src/main/webapp/includes/init-url.jsp
@@ -147,7 +147,13 @@
     if (Boolean.parseBoolean(application.getInitParameter("IsHostedExternally"))) {
         identityServerEndpointContextParam = application.getInitParameter("IdentityServerEndpointContextURL");
     } else {
-        identityServerEndpointContextParam = ServiceURLBuilder.create().setTenant(tenantDomain).build().getAbsolutePublicURL();
+        spAppName = request.getParameter(SERVICE_PROVIDER_NAME_SHORT);
+        ServiceURLBuilder serviceUrlBuilder = ServiceURLBuilder.create().setTenant(tenantDomain);
+        if ("My Account".equals(spAppName) || "Console".equals(spAppName)) {
+            serviceUrlBuilder.setSkipDomainBranding(true);
+        } 
+    
+        identityServerEndpointContextParam = serviceUrlBuilder.build().getAbsolutePublicURL();
     }
 
     if (StringUtils.isNotBlank(identityServerEndpointContextParam)) {

From 70048afece4de5a3c049a6eb858eeed586a469c1 Mon Sep 17 00:00:00 2001
From: Yasasr1 <yasasramanayaka@gmail.com>
Date: Tue, 18 Jun 2024 21:16:31 +0530
Subject: [PATCH 2/2] Add changeset.

---
 .changeset/silly-gorillas-unite.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/silly-gorillas-unite.md

diff --git a/.changeset/silly-gorillas-unite.md b/.changeset/silly-gorillas-unite.md
new file mode 100644
index 00000000000..2711bca0967
--- /dev/null
+++ b/.changeset/silly-gorillas-unite.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Skip custom domains for console and my account.