diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
index 5fca7476f2..3741a2035f 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInActivity.kt
@@ -20,6 +20,7 @@ import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 
@@ -43,7 +44,7 @@ class AnalyticsOptInActivity : VectorBaseActivity<ActivitySimpleBinding>() {
         viewModel.observeViewEvents {
             when (it) {
                 AnalyticsOptInViewEvents.OnDataSaved -> finish()
-            }
+            }.exhaustive
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index a8038e2224..279499b7e9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -299,7 +299,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         analyticsConsent.setOnPreferenceChangeListener { _, newValue ->
             val newValueBool = newValue as? Boolean ?: false
             if (newValueBool) {
-                // User want to enable analytics, display the opt in screen
+                // User wants to enable analytics, display the opt in screen
                 navigator.openAnalyticsOptIn(requireContext())
             } else {
                 // Just disable analytics
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 31b1ab597f..33405f5e46 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1379,7 +1379,13 @@
     <string name="settings_opt_in_of_analytics_ok">Yes, I want to help!</string>
 
     <!-- analytics v2 -->
-    <string name="analytics_consent_splash">Send anonymous usage data to element.io</string>
+    <string name="analytics_opt_in_title">Help improve Element</string>
+    <!-- The template will be replaced by the value of the resource analytics_opt_in_content_link -->
+    <string name="analytics_opt_in_content">Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.\n\nYou can read all our terms %s.</string>
+    <string name="analytics_opt_in_content_link">here</string>
+    <string name="analytics_opt_in_list_item_1">We <b>don\'t</b> record or profile any account data</string>
+    <string name="analytics_opt_in_list_item_2">We <b>don\'t</b> share information with third parties</string>
+    <string name="analytics_opt_in_list_item_3">You can turn this off anytime in settings</string>
 
     <string name="settings_data_save_mode">Data save mode</string>
     <string name="settings_data_save_mode_summary">Data save mode applies a specific filter so presence updates and typing notifications are filtered out.</string>
@@ -3644,15 +3650,6 @@
     <!-- %s will be replaced by the value of link_this_email_settings_link and styled as a link -->
     <string name="link_this_email_with_your_account">%s in Settings to receive invites directly in Element.</string>
 
-    <!-- Analytics -->
-    <string name="analytics_opt_in_title">Help improve Element</string>
-    <!-- The template will be replaced by the value of the resource analytics_opt_in_content_link -->
-    <string name="analytics_opt_in_content">Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.\n\nYou can read all our terms %s.</string>
-    <string name="analytics_opt_in_content_link">here</string>
-    <string name="analytics_opt_in_list_item_1">We <b>don\'t</b> record or profile any account data</string>
-    <string name="analytics_opt_in_list_item_2">We <b>don\'t</b> share information with third parties</string>
-    <string name="analytics_opt_in_list_item_3">You can turn this off anytime in settings</string>
-
     <!-- Poll -->
     <string name="create_poll_title">Create Poll</string>
     <string name="create_poll_question_title">Poll question or topic</string>