diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 8fcf69cd..77fb289e 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -86,7 +86,7 @@ class RegistrationPage extends React.Component {
       payload.tpa_hint = this.tpaHint;
     }
     this.props.getThirdPartyAuthContext(payload);
-    this.getExperiments();
+    // this.getExperiments();
   }
 
   shouldComponentUpdate(nextProps) {
@@ -451,23 +451,23 @@ class RegistrationPage extends React.Component {
       // Fire optimizely events
       window.optimizely.push({
         type: 'event',
-        eventName: 'user_registered_successfully',
+        eventName: 'VAN-504-user-registered',
       });
 
-      // if (this.state.optimizelyExperimentName !== 'progressiveProfilingConcept1') {
-      //   window.optimizely.push({
-      //     type: 'event',
-      //     eventName: 'van_504_conversion_rate',
-      //   });
-      //   ['yearOfBirth', 'gender', 'levelOfEducation'].forEach(fieldName => {
-      //     if (this.state[fieldName]) {
-      //       window.optimizely.push({
-      //         type: 'event',
-      //         eventName: `van_504_${fieldName}`,
-      //       });
-      //     }
-      //   });
-      // }
+      if (window.optimizelyExperimentName !== 'VAN-504-PP-Exp') {
+        window.optimizely.push({
+          type: 'event',
+          eventName: 'VAN-504-conversion',
+        });
+        ['yearOfBirth', 'gender', 'levelOfEducation'].forEach(fieldName => {
+          if (this.state[fieldName]) {
+            window.optimizely.push({
+              type: 'event',
+              eventName: `van_504_${fieldName}`,
+            });
+          }
+        });
+      }
     }
 
     return (
@@ -481,7 +481,7 @@ class RegistrationPage extends React.Component {
           success={this.props.registrationResult.success}
           redirectUrl={this.props.registrationResult.redirectUrl}
           finishAuthUrl={finishAuthUrl}
-          // redirectToWelcomePage={this.state.optimizelyExperimentName === 'progressiveProfilingConcept1'}
+          redirectToWelcomePage={window.optimizelyExperimentName === 'VAN-504-PP-Exp'}
         />
         <div className="d-flex justify-content-center m-4">
           <div className="d-flex flex-column">
@@ -610,7 +610,7 @@ class RegistrationPage extends React.Component {
                     }}
                   />
                 </div>
-                {getConfig().REGISTRATION_OPTIONAL_FIELDS && this.state.optimizelyExperimentName !== 'hide_optional_fields' ? (
+                {getConfig().REGISTRATION_OPTIONAL_FIELDS && window.optimizelyExperimentName !== 'VAN-504-PP-Exp' ? (
                   <AuthnValidationFormGroup
                     label={intl.formatMessage(messages['support.education.research'])}
                     for="optional"
diff --git a/src/register/tests/RegistrationPage.test.jsx b/src/register/tests/RegistrationPage.test.jsx
index 603d2ab9..248bb739 100644
--- a/src/register/tests/RegistrationPage.test.jsx
+++ b/src/register/tests/RegistrationPage.test.jsx
@@ -127,10 +127,9 @@ describe('RegistrationPageTests', () => {
   });
 
   it('should not show optional field check when optimizely experiment is set', () => {
-    window.optimizelyExperimentName = 'hide_optional_fields';
+    window.optimizelyExperimentName = 'VAN-504-PP-Exp';
 
     const registrationPage = mount(reduxWrapper(<IntlRegistrationPage {...props} />));
-    expect(registrationPage.find('RegistrationPage').state('optimizelyExperimentName')).toEqual('hide_optional_fields');
     expect(registrationPage.find('#optional').length).toEqual(0);
 
     delete window.optimizelyExperimentName;
diff --git a/src/welcome/WelcomePage.jsx b/src/welcome/WelcomePage.jsx
index 4c3b1396..f5760ef7 100644
--- a/src/welcome/WelcomePage.jsx
+++ b/src/welcome/WelcomePage.jsx
@@ -70,14 +70,13 @@ const WelcomePage = (props) => {
     window.optimizely = window.optimizely || [];
     window.optimizely.push({
       type: 'event',
-      eventName: 'van_504_conversion_rate',
+      eventName: 'VAN-504-conversion',
     });
   };
 
   const handleSubmit = (e) => {
     e.preventDefault();
     fireOptimizelyEvent();
-    window.optimizely = window.optimizely || [];
     ['yearOfBirth', 'gender', 'levelOfEducation'].forEach(fieldName => {
       if (values[fieldName]) {
         window.optimizely.push({