diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index da9e5f317..d888de6cd 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -154,6 +154,8 @@
     "role_update_success": "Roles updated successfully!!",
     "self_host_docs": "Self Host Documentation",
     "send_magic_link": "Send magic link",
+    "setup_failure": "Setup has failed!!",
+    "setup_success": "Setup completed successful!!",
     "sign_in_agreement": "By signing in, you are agreeing to our",
     "sign_in_options": "All sign in option",
     "sign_out": "Sign out",
diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index 38ba4e350..72176752b 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -39,7 +39,6 @@ declare module '@vue/runtime-core' {
     SettingsReset: typeof import('./components/settings/Reset.vue')['default']
     SettingsServerRestart: typeof import('./components/settings/ServerRestart.vue')['default']
     SettingsSmtpConfiguration: typeof import('./components/settings/SmtpConfiguration.vue')['default']
-    SetupDataSharing: typeof import('./components/setup/DataSharing.vue')['default']
     SetupDataSharingAndNewsletter: typeof import('./components/setup/DataSharingAndNewsletter.vue')['default']
     TeamsAdd: typeof import('./components/teams/Add.vue')['default']
     TeamsDetails: typeof import('./components/teams/Details.vue')['default']
diff --git a/packages/hoppscotch-sh-admin/src/components/setup/DataSharingAndNewsletter.vue b/packages/hoppscotch-sh-admin/src/components/setup/DataSharingAndNewsletter.vue
index 72d9b40b7..3fd90f3d1 100644
--- a/packages/hoppscotch-sh-admin/src/components/setup/DataSharingAndNewsletter.vue
+++ b/packages/hoppscotch-sh-admin/src/components/setup/DataSharingAndNewsletter.vue
@@ -16,8 +16,8 @@
             {{ t('data_sharing.description') }}
           </p>
           <HoppSmartToggle
-            :on="shareData"
-            @change="shareData = !shareData"
+            :on="dataSharingToggle"
+            @change="dataSharingToggle = !dataSharingToggle"
             class="my-5 text-white w-min justify-start"
           >
             {{ t('data_sharing.toggle_description') }}
@@ -36,10 +36,10 @@
           <p class="text-lg font-bold text-white">
             {{ t('newsletter.title') }}
           </p>
-          <p>{{ t('configs.newsletter.description') }}</p>
+          <p>{{ t('newsletter.description') }}</p>
           <HoppSmartToggle
-            :on="shareEmail"
-            @change="shareEmail = !shareEmail"
+            :on="newsletterToggle"
+            @change="newsletterToggle = !newsletterToggle"
             class="my-5 text-white"
           >
             {{ t('newsletter.toggle_description') }}
@@ -90,26 +90,19 @@ const emit = defineEmits<{
   (event: 'onSetupComplete', status: boolean): void;
 }>();
 
-const shareData = ref(true);
-const shareEmail = ref(true);
-
-const submitSelection = async () => {
-  const dataSharingResult = shareData.value && (await toggleDataSharing());
-  const newsletterResult = shareEmail.value && (await toggleNewsletter());
-
-  // if (dataSharingResult && newsletterResult) {
-  emit('onSetupComplete', true);
-  // }
-};
+const dataSharingToggle = ref(true);
+const newsletterToggle = ref(true);
 
+// Toggle data sharing
 const dataSharingMutation = useMutation(ToggleAnalyticsCollectionDocument);
 
 const toggleDataSharing = async () => {
-  const status = shareData.value ? 'ENABLE' : 'DISABLE';
+  const status = dataSharingToggle.value ? 'ENABLE' : 'DISABLE';
   const variables = { status };
   const result = await dataSharingMutation.executeMutation(
     variables as ToggleAnalyticsCollectionMutationVariables
   );
+
   if (result.error) {
     toast.error(t('state.data_sharing_failure'));
     return false;
@@ -117,8 +110,8 @@ const toggleDataSharing = async () => {
   return true;
 };
 
+// Toggle subscription to newsletter
 const toggleNewsletter = async () => {
-  shareData.value = !shareData.value;
   try {
     await listmonkApi.post('/subscription', {
       email: user?.email,
@@ -133,4 +126,19 @@ const toggleNewsletter = async () => {
     return false;
   }
 };
+
+// Submit selections made
+const submitSelection = async () => {
+  const dataSharingResult =
+    dataSharingToggle.value && (await toggleDataSharing());
+  const newsletterResult = newsletterToggle.value && (await toggleNewsletter());
+
+  const setupDataComplete = !dataSharingToggle.value || dataSharingResult;
+  const setupNewsletterComplete = !newsletterToggle.value || newsletterResult;
+
+  emit(
+    'onSetupComplete',
+    setupDataComplete && setupNewsletterComplete ? true : false
+  );
+};
 </script>