diff --git a/app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx b/app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
index 3e591cba3..1abfe815e 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
@@ -14,7 +14,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { NavLink } from 'react-router-dom';
-import { LOGIN, WELCOME } from '../../OnboardingView/OnboardingConstants';
+import { WELCOME } from '../../OnboardingView/OnboardingConstants';
 
 /**
  * A Functional React component for rendering the Browser Welcome View
@@ -29,7 +29,7 @@ const WelcomeView = (props) => {
 			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
 			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_welcome_message')}</div>
 			<img className="WelcomeView__rocketShip" src="/app/images/hub/welcome/rocketShip.png" />
-			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => setSetupStep({ setup_step: LOGIN, origin: WELCOME })}>
+			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => setSetupStep({ setup_step: WELCOME, origin: WELCOME })}>
 				<span>{t('ghostery_dawn_onboarding_lets_do_this')}</span>
 			</NavLink>
 		</div>
diff --git a/app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx b/app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
index 4b774d70b..594ab7a04 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
@@ -18,7 +18,7 @@ import { NavLink } from 'react-router-dom';
 import Tooltip from '../../../../shared-components/Tooltip';
 import RadioButton from '../../../../shared-components/RadioButton/RadioButton';
 import ToggleCheckbox from '../../../../shared-components/ToggleCheckbox/ToggleCheckbox';
-import { CHOOSE_DEFAULT_SEARCH, ONBOARDING } from '../../OnboardingView/OnboardingConstants';
+import { BLOCK_SETTINGS, ONBOARDING } from '../../OnboardingView/OnboardingConstants';
 
 /**
  * @class Implement the Block Settings View for the Dawn Hub onboarding flow
@@ -119,7 +119,7 @@ class BlockSettingsView extends Component {
 			setBlockingPolicy({ blockingPolicy });
 
 			setSetupStep({
-				setup_step: CHOOSE_DEFAULT_SEARCH,
+				setup_step: BLOCK_SETTINGS,
 				dawn_setup_number: this.buildSetupNumberString(),
 				origin: ONBOARDING
 			});
diff --git a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
index 7a422102c..4dda4582e 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx
@@ -16,7 +16,7 @@ import { NavLink } from 'react-router-dom';
 import ClassNames from 'classnames';
 import { alwaysLog } from '../../../../../src/utils/common';
 import RadioButton from '../../../../shared-components/RadioButton';
-import { ONBOARDING, CHOOSE_PLAN } from '../../OnboardingView/OnboardingConstants';
+import { ONBOARDING, CHOOSE_DEFAULT_SEARCH, CHOOSE_PLAN } from '../../OnboardingView/OnboardingConstants';
 import {
 	SEARCH_GHOSTERY,
 	SEARCH_BING,
@@ -162,7 +162,7 @@ class ChooseDefaultSearchView extends Component {
 		setDefaultSearch(chosenSearchName);
 
 		setSetupStep({
-			setup_step: CHOOSE_PLAN,
+			setup_step: CHOOSE_DEFAULT_SEARCH,
 			dawn_setup_number: searchSetupNumbers.find(elem => elem.name === chosenSearchName).dawn_setup_number,
 			origin: ONBOARDING
 		});
diff --git a/app/dawn-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx b/app/dawn-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
index 94a85e6d9..57a4ef07d 100644
--- a/app/dawn-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
+++ b/app/dawn-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
@@ -11,7 +11,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0
  */
 
-import React, { Fragment } from 'react';
+import React, { Fragment, useEffect } from 'react';
 import { NavLink } from 'react-router-dom';
 
 /**
@@ -23,8 +23,11 @@ const SuccessView = (props) => {
 	const { actions } = props;
 	const { sendPing } = actions;
 
-	const handleCTAButtonClick = () => {
+	useEffect(() => {
 		sendPing({ type: 'gb_onboarding_success' });
+	}, []);
+
+	const handleCTAButtonClick = () => {
 		window.close();
 	};