diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index e0c2fb339f52..3b0b43accbc6 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -7367,7 +7367,18 @@ function completePaymentOnboarding(paymentSelected: ValueOf<typeof CONST.PAYMENT
         onboardingPurpose = CONST.ONBOARDING_CHOICES.CHAT_SPLIT;
     }
 
-    Report.completeOnboarding(onboardingPurpose, CONST.ONBOARDING_MESSAGES[onboardingPurpose], personalDetails?.firstName ?? '', personalDetails?.lastName ?? '', paymentSelected);
+    Report.completeOnboarding(
+        onboardingPurpose,
+        CONST.ONBOARDING_MESSAGES[onboardingPurpose],
+        personalDetails?.firstName ?? '',
+        personalDetails?.lastName ?? '',
+        undefined,
+        undefined,
+        paymentSelected,
+        undefined,
+        undefined,
+        true,
+    );
 }
 
 function payMoneyRequest(paymentType: PaymentMethodType, chatReport: OnyxTypes.Report, iouReport: OnyxEntry<OnyxTypes.Report>, full = true) {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index dde930b522a5..32c0a40876d7 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -3478,6 +3478,7 @@ function prepareOnboardingOptimisticData(
     adminsChatReportID?: string,
     onboardingPolicyID?: string,
     userReportedIntegration?: OnboardingAccounting,
+    wasInvited?: boolean,
 ) {
     // If the user has the "combinedTrackSubmit" beta enabled we'll show different tasks for track and submit expense.
     if (Permissions.canUseCombinedTrackSubmit()) {
@@ -3761,12 +3762,14 @@ function prepareOnboardingOptimisticData(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: engagementChoice},
         },
-        {
+    );
+    if (!wasInvited) {
+        optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_ONBOARDING,
             value: {hasCompletedGuidedSetupFlow: true},
-        },
-    );
+        });
+    }
 
     const successData: OnyxUpdate[] = [...tasksForSuccessData];
     successData.push({
@@ -3821,12 +3824,15 @@ function prepareOnboardingOptimisticData(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: null},
         },
-        {
+    );
+
+    if (!wasInvited) {
+        failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_ONBOARDING,
             value: {hasCompletedGuidedSetupFlow: false},
-        },
-    );
+        });
+    }
 
     if (userReportedIntegration) {
         optimisticData.push({
@@ -3910,6 +3916,7 @@ function completeOnboarding(
     paymentSelected?: string,
     companySize?: OnboardingCompanySize,
     userReportedIntegration?: OnboardingAccounting,
+    wasInvited?: boolean,
 ) {
     const {optimisticData, successData, failureData, guidedSetupData, actorAccountID} = prepareOnboardingOptimisticData(
         engagementChoice,
@@ -3917,6 +3924,7 @@ function completeOnboarding(
         adminsChatReportID,
         onboardingPolicyID,
         userReportedIntegration,
+        wasInvited,
     );
 
     const parameters: CompleteGuidedSetupParams = {