diff --git a/.changeset/honest-ties-rhyme.md b/.changeset/honest-ties-rhyme.md
new file mode 100644
index 00000000000..7db6511e0df
--- /dev/null
+++ b/.changeset/honest-ties-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Improve logic to fix conflict on sp and spId params
diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-complete.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-complete.jsp
index e96494c63a9..4a75c054034 100644
--- a/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-complete.jsp
+++ b/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-complete.jsp
@@ -124,9 +124,7 @@
     if (StringUtils.isNotBlank(spId)) {
         try {
             ApplicationDataRetrievalClient applicationDataRetrieval = new ApplicationDataRetrievalClient();
-            if (spId.equals("My_Account")) {
-                sp = "My Account";
-            } else {
+            if (!sp.equals("My Account")) {
                 sp = applicationDataRetrieval.getApplicationName(tenantDomain,spId);
             }
         } catch (Exception e) {