diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index 5d2741111..da9e5f317 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -18,7 +18,7 @@
     },
     "confirm_changes": "Hoppscotch server must restart to reflect the new changes. Confirm changes made to the server configurations?",
     "input_empty": "Please fill all the fields before updating the configurations",
-    "data-sharing": {
+    "data_sharing": {
       "title": "Data Sharing",
       "description": "Help improve Hoppscotch by sharing anonymous data",
       "enable": "Enable Data Sharing",
@@ -111,6 +111,7 @@
     "copied_to_clipboard": "Copied to clipboard",
     "create_team_failure": "Failed to create workspace!!",
     "create_team_success": "Workspace created successfully!!",
+    "data_sharing_failure": "Failed to update data sharing settings",
     "delete_request_failure": "Shared Request deletion failed!!",
     "delete_request_success": "Shared Request deleted successfully!!",
     "delete_team_failure": "Workspace deletion failed!!",
@@ -133,6 +134,7 @@
     "magic_link_sign_in": "Click on the link to sign in.",
     "magic_link_success": "We sent a magic link to",
     "microsoft_signin_failure": "Failed to login with Microsoft",
+    "newsletter_failure": "Unable to update newsletter settings",
     "non_admin_logged_in": "Logged in as non admin user.",
     "non_admin_login": "You are logged in. But you're not an admin",
     "owner_not_present": "Atleast one owner should be present in the team!!",
diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index 6c3f313a1..d976a8968 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -17,14 +17,22 @@ declare module '@vue/runtime-core' {
     HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
     HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
     HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
+    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
     HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
     HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
     HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
     HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
+    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
     HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
+    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
+    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
+    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
     HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
+    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
+    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
+    IconLucideUser: typeof import('~icons/lucide/user')['default']
     SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']
     SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default']
     SettingsDataSharing: typeof import('./components/settings/DataSharing.vue')['default']
diff --git a/packages/hoppscotch-sh-admin/src/components/settings/DataSharing.vue b/packages/hoppscotch-sh-admin/src/components/settings/DataSharing.vue
index f2224fce4..3fcc352be 100644
--- a/packages/hoppscotch-sh-admin/src/components/settings/DataSharing.vue
+++ b/packages/hoppscotch-sh-admin/src/components/settings/DataSharing.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="md:grid md:grid-cols-3 md:gap-4 border-divider border-b py-8">
     <div class="px-8 md:col-span-1">
-      <h3 class="heading">{{ t('configs.data-sharing.title') }}</h3>
+      <h3 class="heading">{{ t('configs.data_sharing.title') }}</h3>
       <p class="my-1 text-secondaryLight">
-        {{ t('configs.data-sharing.description') }}
+        {{ t('configs.data_sharing.description') }}
       </p>
     </div>
 
     <div class="mt-5 mx-8 md:col-span-2">
       <section v-if="dataSharingConfigs">
         <h4 class="font-semibold text-secondaryDark">
-          {{ t('configs.data-sharing.title') }}
+          {{ t('configs.data_sharing.title') }}
         </h4>
 
         <div class="space-y-4 py-4">
@@ -19,7 +19,7 @@
               :on="dataSharingConfigs.enabled"
               @change="dataSharingConfigs.enabled = !dataSharingConfigs.enabled"
             >
-              {{ t('configs.data-sharing.toggle_description') }}
+              {{ t('configs.data_sharing.toggle_description') }}
             </HoppSmartToggle>
           </div>
         </div>
@@ -28,7 +28,7 @@
           outline
           filled
           :icon="IconShieldQuestion"
-          :label="t('configs.data-sharing.see_shared')"
+          :label="t('configs.data_sharing.see_shared')"
           to="http://docs.hoppscotch.io"
           class="w-min my-2"
         />
diff --git a/packages/hoppscotch-sh-admin/src/components/setup/DataSharing.vue b/packages/hoppscotch-sh-admin/src/components/setup/DataSharing.vue
index 5f0449824..72d9b40b7 100644
--- a/packages/hoppscotch-sh-admin/src/components/setup/DataSharing.vue
+++ b/packages/hoppscotch-sh-admin/src/components/setup/DataSharing.vue
@@ -36,7 +36,7 @@
           <p class="text-lg font-bold text-white">
             {{ t('newsletter.title') }}
           </p>
-          <p class="text-sm font-light">Get updates about our latest news</p>
+          <p>{{ t('configs.newsletter.description') }}</p>
           <HoppSmartToggle
             :on="shareEmail"
             @change="shareEmail = !shareEmail"
@@ -111,7 +111,7 @@ const toggleDataSharing = async () => {
     variables as ToggleAnalyticsCollectionMutationVariables
   );
   if (result.error) {
-    toast.error('Failed to update data sharing settings');
+    toast.error(t('state.data_sharing_failure'));
     return false;
   }
   return true;
@@ -129,7 +129,7 @@ const toggleNewsletter = async () => {
     return true;
   } catch (e) {
     console.error(e);
-    toast.error(t('Unable to update newsletter settings'));
+    toast.error(t('state.newsletter_failure'));
     return false;
   }
 };