diff --git a/src/ui/constants/login-page-dom-constants.ts b/src/ui/constants/login-page-dom-constants.ts
index 04e3dc5..93cfcaa 100644
--- a/src/ui/constants/login-page-dom-constants.ts
+++ b/src/ui/constants/login-page-dom-constants.ts
@@ -33,8 +33,8 @@ export class LoginPageDomConstants {
 
     // TODO: Use data test id's here.
     // Tracker: https://github.com/wso2-enterprise/asgardeo-product/issues/999
-    public static readonly USERNAME_INPUT_DATA_ATTR: string = "#usernameUserInput";
+    public static readonly USERNAME_INPUT_DATA_ATTR: string = "login-page-username-input";
     public static readonly PASSWORD_INPUT_DATA_ATTR: string = "login-page-password-input";
-    public static readonly CONTINUE_BUTTON_DATA_ATTR: string = "Continue";
+    public static readonly CONTINUE_BUTTON_DATA_ATTR: string = "identifier-auth-continue-button";
     public static readonly SUBMIT_BUTTON_DATA_ATTR: string = "login-page-continue-login-button";
 }
diff --git a/src/ui/page-objects/login-page.ts b/src/ui/page-objects/login-page.ts
index 140aef3..8b975dc 100644
--- a/src/ui/page-objects/login-page.ts
+++ b/src/ui/page-objects/login-page.ts
@@ -41,8 +41,9 @@ export class LoginPage {
      * Get the data attribute for login page user input field.
      * @return {Cypress.Chainable<JQuery<HTMLElement>>}
      */
-    public getLoginUsernameInputField(): Cypress.Chainable<JQuery<HTMLElement>> {
-        return cy.get(LoginPageDomConstants.USERNAME_INPUT_DATA_ATTR);
+    public getLoginUsernameInputField(): Cypress.Chainable<Element> {
+        
+        return cy.dataTestId(LoginPageDomConstants.USERNAME_INPUT_DATA_ATTR);
     }
 
     /**