From 22de328e49a00d5ce9cdb9bb24a703f867ea1998 Mon Sep 17 00:00:00 2001
From: Sumedhe Dissanayake <sumedhedissanayake@gmail.com>
Date: Fri, 10 Jan 2025 13:32:45 +0530
Subject: [PATCH] Fix tenant null issue in self registration flow

---
 .changeset/nine-meals-cross.md                           | 5 +++++
 .../apps/authentication-portal/src/main/webapp/login.jsp | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/nine-meals-cross.md

diff --git a/.changeset/nine-meals-cross.md b/.changeset/nine-meals-cross.md
new file mode 100644
index 00000000000..e17faf66e8b
--- /dev/null
+++ b/.changeset/nine-meals-cross.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Fix tenant null issue in self registration flow
diff --git a/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp b/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp
index 7d775bc106e..8876350de47 100755
--- a/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp
+++ b/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp
@@ -301,13 +301,14 @@
         loginContextRequestUrl += "&tenantDomain=" + tenantDomain;
     }
 
-    String t = Encode.forUriComponent(request.getParameter("t"));
-    String ut = Encode.forUriComponent(request.getParameter("ut"));
+    String t = request.getParameter("t");
+    String ut = request.getParameter("ut");
+
     if (StringUtils.isNotBlank(t)) {
-        loginContextRequestUrl += "&t=" + t;
+        loginContextRequestUrl += "&t=" + Encode.forUriComponent(t);
     }
     if (StringUtils.isNotBlank(ut)) {
-        loginContextRequestUrl += "&ut=" + ut;
+        loginContextRequestUrl += "&ut=" + Encode.forUriComponent(ut);
     }
 
     if (StringUtils.isNotBlank(usernameIdentifier)) {