diff --git a/src/common-components/RedirectLogistration.jsx b/src/common-components/RedirectLogistration.jsx
index e5f13d56..824d8872 100644
--- a/src/common-components/RedirectLogistration.jsx
+++ b/src/common-components/RedirectLogistration.jsx
@@ -6,6 +6,7 @@ import { Redirect } from 'react-router-dom';
 import { getConfig } from '@edx/frontend-platform';
 
 import { WELCOME_PAGE } from '../data/constants';
+import { setCookie } from '../data/utils';
 
 function RedirectLogistration(props) {
   const {
@@ -25,6 +26,7 @@ function RedirectLogistration(props) {
     }
 
     if (redirectToWelcomePage) {
+      setCookie('van-504-returning-user', true);
       // use this component to redirect WelcomePage after successful registration
       // return <Redirect to={WELCOME_PAGE} />;
       const registrationResult = { redirectUrl: finalRedirectUrl, success };
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 513a8677..916df391 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -32,7 +32,7 @@ import {
   DEFAULT_STATE, LOGIN_PAGE, PENDING_STATE, REGISTER_PAGE, VALID_EMAIL_REGEX,
 } from '../data/constants';
 import {
-  getTpaProvider, getTpaHint, updatePathWithQueryParams, getAllPossibleQueryParam, setSurveyCookie, setCookie,
+  getTpaProvider, getTpaHint, updatePathWithQueryParams, getAllPossibleQueryParam, setSurveyCookie,
 } from '../data/utils';
 
 class RegistrationPage extends React.Component {
@@ -446,7 +446,6 @@ class RegistrationPage extends React.Component {
 
     if (this.props.registrationResult.success) {
       setSurveyCookie('register');
-      setCookie('van-504-returning-user', true);
       // Fire optimizely event
       if (this.state.optimizelyExperimentName !== 'progressive_profiling_phase1') {
         window.optimizely = window.optimizely || [];