diff --git a/app/client/cypress/locators/welcomePage.json b/app/client/cypress/locators/welcomePage.json
index c46795fa08..be3b0b57d4 100644
--- a/app/client/cypress/locators/welcomePage.json
+++ b/app/client/cypress/locators/welcomePage.json
@@ -9,6 +9,7 @@
   "roleInput": ".t--welcome-form-role-input input",
   "useCaseDropdown": ".t--welcome-form-role-usecase",
   "useCaseDropdownOption": ".rc-select-item-option-content",
+  "continueButton": ".t--welcome-form-continue-button",
   "submitButton": ".t--welcome-form-submit-button",
   "dataCollection": ".t--welcome-form-datacollection",
   "newsLetter": ".t--welcome-form-newsletter",
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 48cec02427..89fb99afda 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1280,17 +1280,17 @@ Cypress.Commands.add("createSuperUser", () => {
   cy.get(welcomePage.email).should("be.visible");
   cy.get(welcomePage.password).should("be.visible");
   cy.get(welcomePage.verifyPassword).should("be.visible");
-  cy.get(welcomePage.submitButton).should("be.disabled");
+  cy.get(welcomePage.continueButton).should("be.disabled");
 
   cy.get(welcomePage.firstName).type(Cypress.env("USERNAME"));
-  cy.get(welcomePage.submitButton).should("be.disabled");
+  cy.get(welcomePage.continueButton).should("be.disabled");
   cy.get(welcomePage.email).type(Cypress.env("USERNAME"));
-  cy.get(welcomePage.submitButton).should("be.disabled");
+  cy.get(welcomePage.continueButton).should("be.disabled");
   cy.get(welcomePage.password).type(Cypress.env("PASSWORD"));
-  cy.get(welcomePage.submitButton).should("be.disabled");
+  cy.get(welcomePage.continueButton).should("be.disabled");
   cy.get(welcomePage.verifyPassword).type(Cypress.env("PASSWORD"));
-  cy.get(welcomePage.submitButton).should("not.be.disabled");
-  cy.get(welcomePage.submitButton).click();
+  cy.get(welcomePage.continueButton).should("not.be.disabled");
+  cy.get(welcomePage.continueButton).click();
 
   cy.get(welcomePage.roleDropdown).click();
   cy.get(welcomePage.roleDropdownOption).eq(1).click();
@@ -1300,14 +1300,7 @@ Cypress.Commands.add("createSuperUser", () => {
   cy.get(welcomePage.submitButton).should("not.be.disabled");
   cy.get(welcomePage.submitButton).click();
   //in case of airgapped both anonymous data and newsletter are disabled
-  if (!Cypress.env("AIRGAPPED")) {
-    cy.wait("@createSuperUser").then((interception) => {
-      expect(interception.request.body).contains(
-        "allowCollectingAnonymousData=true",
-      );
-      expect(interception.request.body).contains("signupForNewsletter=true");
-    });
-  } else {
+  if (Cypress.env("AIRGAPPED")) {
     cy.wait("@createSuperUser").then((interception) => {
       expect(interception.request.body).to.not.contain(
         "allowCollectingAnonymousData=true",
@@ -1316,6 +1309,13 @@ Cypress.Commands.add("createSuperUser", () => {
         "signupForNewsletter=true",
       );
     });
+  } else {
+    cy.wait("@createSuperUser").then((interception) => {
+      expect(interception.request.body).contains(
+        "allowCollectingAnonymousData=true",
+      );
+      expect(interception.request.body).contains("signupForNewsletter=true");
+    });
   }
 
   cy.LogOut();
diff --git a/app/client/src/pages/setup/DetailsForm.tsx b/app/client/src/pages/setup/DetailsForm.tsx
index 51a09a3706..76ac51f68a 100644
--- a/app/client/src/pages/setup/DetailsForm.tsx
+++ b/app/client/src/pages/setup/DetailsForm.tsx
@@ -182,22 +182,35 @@ export default function DetailsForm(
             )}
           </div>
         )}
-        <ButtonWrapper>
-          <Button
-            className="t--welcome-form-submit-button w-100"
-            isDisabled={props.invalid}
-            kind="primary"
-            onClick={() => {
-              if (isFirstPage) setFormState(1);
-            }}
-            size="md"
-            type={isFirstPage ? "button" : "submit"}
-          >
-            {isFirstPage
-              ? createMessage(CONTINUE)
-              : createMessage(ONBOARDING_STATUS_GET_STARTED)}
-          </Button>
-        </ButtonWrapper>
+        {isFirstPage && (
+          <ButtonWrapper>
+            <Button
+              className="t--welcome-form-continue-button w-100"
+              isDisabled={props.invalid}
+              kind="primary"
+              onClick={() => {
+                setFormState(1);
+              }}
+              size="md"
+              type="button"
+            >
+              {createMessage(CONTINUE)}
+            </Button>
+          </ButtonWrapper>
+        )}
+        {!isFirstPage && (
+          <ButtonWrapper>
+            <Button
+              className="t--welcome-form-submit-button w-100"
+              isDisabled={props.invalid}
+              kind="primary"
+              size="md"
+              type="submit"
+            >
+              {createMessage(ONBOARDING_STATUS_GET_STARTED)}
+            </Button>
+          </ButtonWrapper>
+        )}
       </StyledFormBodyWrapper>
     </DetailsFormWrapper>
   );