From f0a5981f6a1b1e45e07dddebec1e8e17e9c5a0ba Mon Sep 17 00:00:00 2001
From: DilshanSenarath <74205483+DilshanSenarath@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:34:10 +0530
Subject: [PATCH 1/2] add a null check for the username field value

---
 .../main/webapp/self-registration-username-request.jsp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-username-request.jsp b/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-username-request.jsp
index 1fb38b539ef..a6f62cc58e8 100644
--- a/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-username-request.jsp
+++ b/identity-apps-core/apps/recovery-portal/src/main/webapp/self-registration-username-request.jsp
@@ -247,8 +247,8 @@
                             }
                             break;
                         }
-                    }   
-                
+                    }
+
                 if (federatedAuthenticators.length() > 0) {
                     isFederated = true;
                 }
@@ -483,7 +483,7 @@
                                     "Enter.your.username.here")%>
                             </label>
                             <input id="username" name="username" type="text" required
-                                <% if(skipSignUpEnableCheck) {%> value="<%=Encode.forHtmlAttribute(username)%>" <%}%>>
+                                <% if(skipSignUpEnableCheck && StringUtils.isNotBlank(username)) {%> value="<%=Encode.forHtmlAttribute(username)%>" <%}%>>
                         </div>
                         <% if (isSaaSApp) { %>
                         <p class="ui tiny compact info message">
@@ -1574,7 +1574,7 @@
             var isSSOLoginAuthenticatorConfigured = JSON.parse(<%=isSSOLoginAuthenticatorConfigured%>);
             var emailDomainDiscoveryEnabled = JSON.parse(<%=emailDomainDiscoveryEnabled%>);
             var emailDomainBasedSelfSignupEnabled = JSON.parse(<%=emailDomainBasedSelfSignupEnabled%>);
-            
+
             if (isSSOLoginAuthenticatorConfigured && emailDomainDiscoveryEnabled && emailDomainBasedSelfSignupEnabled) {
                 var params = new URLSearchParams({
                     idp: 'SSO',
@@ -1589,7 +1589,7 @@
             } else {
                 $("#continue-with-email").hide();
                 $("#federated-authenticators").hide();
-                $("#basic-form").show();        
+                $("#basic-form").show();
             }
 
             var container;

From 1664078748a9b89cbe3b1ac8d41b6c3f718efe9b Mon Sep 17 00:00:00 2001
From: DilshanSenarath <74205483+DilshanSenarath@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:35:37 +0530
Subject: [PATCH 2/2] =?UTF-8?q?Add=20changeset=20=F0=9F=A6=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changeset/happy-rivers-grin.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/happy-rivers-grin.md

diff --git a/.changeset/happy-rivers-grin.md b/.changeset/happy-rivers-grin.md
new file mode 100644
index 00000000000..80d4d488742
--- /dev/null
+++ b/.changeset/happy-rivers-grin.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Add a null check for the username field value