diff --git a/app/client/src/ce/selectors/organizationSelectors.tsx b/app/client/src/ce/selectors/organizationSelectors.tsx
index 15f96c7a17..4f5b19cc3a 100644
--- a/app/client/src/ce/selectors/organizationSelectors.tsx
+++ b/app/client/src/ce/selectors/organizationSelectors.tsx
@@ -62,3 +62,6 @@ export const getHideWatermark = (state: AppState): boolean =>
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const isFreePlan = (state: AppState) => true;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const isWithinAnOrganization = (state: AppState) => true;
diff --git a/app/client/src/ce/utils/signupHelpers.ts b/app/client/src/ce/utils/signupHelpers.ts
index 36cf087cb4..7cb745ab6e 100644
--- a/app/client/src/ce/utils/signupHelpers.ts
+++ b/app/client/src/ce/utils/signupHelpers.ts
@@ -28,6 +28,7 @@ export const redirectUserAfterSignup = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   dispatch?: any,
   isEnabledForCreateNew?: boolean, // is Enabled for only non-invited users
+  isOnLoginPage?: boolean,
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): any => {
@@ -100,7 +101,9 @@ export const redirectUserAfterSignup = (
       error("Error handling the redirect url");
     }
   } else {
-    history.replace(APPLICATIONS_URL);
+    if (!isOnLoginPage) {
+      history.replace(APPLICATIONS_URL);
+    }
   }
 };
 
diff --git a/app/client/src/pages/setup/SignupSuccess.tsx b/app/client/src/pages/setup/SignupSuccess.tsx
index 3efe3f6ff3..5508b7177c 100644
--- a/app/client/src/pages/setup/SignupSuccess.tsx
+++ b/app/client/src/pages/setup/SignupSuccess.tsx
@@ -8,7 +8,10 @@ import { getCurrentUser } from "selectors/usersSelectors";
 import UserWelcomeScreen from "pages/setup/UserWelcomeScreen";
 import { Center } from "pages/setup/common";
 import { Spinner } from "@appsmith/ads";
-import { isValidLicense } from "ee/selectors/organizationSelectors";
+import {
+  isValidLicense,
+  isWithinAnOrganization,
+} from "ee/selectors/organizationSelectors";
 import { redirectUserAfterSignup } from "ee/utils/signupHelpers";
 import { setUserSignedUpFlag } from "utils/storage";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
@@ -22,6 +25,7 @@ export function SignupSuccess() {
   );
   const validLicense = useSelector(isValidLicense);
   const user = useSelector(getCurrentUser);
+  const isOnLoginPage = !useSelector(isWithinAnOrganization);
 
   useEffect(() => {
     user?.email && setUserSignedUpFlag(user?.email);
@@ -37,8 +41,16 @@ export function SignupSuccess() {
         validLicense,
         dispatch,
         isNonInvitedUser,
+        isOnLoginPage,
       ),
-    [],
+    [
+      dispatch,
+      isNonInvitedUser,
+      isOnLoginPage,
+      redirectUrl,
+      shouldEnableFirstTimeUserOnboarding,
+      validLicense,
+    ],
   );
 
   const onGetStarted = useCallback((proficiency?: string, useCase?: string) => {