diff --git a/src/configuredialog/configuremiscpage.cpp b/src/configuredialog/configuremiscpage.cpp
index f3cebb51d..3cfb9c2b2 100644
--- a/src/configuredialog/configuremiscpage.cpp
+++ b/src/configuredialog/configuremiscpage.cpp
@@ -198,7 +198,11 @@ KuserFeedBackPagePrintingTab::KuserFeedBackPagePrintingTab(QWidget *parent)
 
 void KuserFeedBackPagePrintingTab::save()
 {
-
+    if (KMKernel::self()) {
+        // set current active mode + write back the config for future starts
+        KMKernel::self()->userFeedbackProvider()->setTelemetryMode(mUserFeedbackWidget->telemetryMode());
+        KMKernel::self()->userFeedbackProvider()->setSurveyInterval(mUserFeedbackWidget->surveyInterval());
+    }
 }
 
 void KuserFeedBackPagePrintingTab::doResetToDefaultsOther()
diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
index 498f2568d..1229ec44f 100644
--- a/src/kmkernel.cpp
+++ b/src/kmkernel.cpp
@@ -120,6 +120,9 @@ using KMail::MailServiceImpl;
 #include <KUserFeedback/ScreenInfoSource>
 #include <KUserFeedback/QtVersionSource>
 #include <KUserFeedback/Provider>
+#include <KUserFeedback/StartCountSource>
+#include <KUserFeedback/UsageTimeSource>
+#include <KUserFeedback/LocaleInfoSource>
 #endif
 
 
@@ -151,7 +154,10 @@ KMKernel::KMKernel(QObject *parent)
     mUserFeedbackProvider->addDataSource(new KUserFeedback::ScreenInfoSource);
     mUserFeedbackProvider->addDataSource(new KUserFeedback::QtVersionSource);
 
-    mUserFeedbackProvider->setTelemetryMode(KUserFeedback::Provider::TelemetryMode(KSharedConfig::openConfig()->group("General").readEntry("TelemetryMode", int(KUserFeedback::Provider::NoTelemetry))));
+    mUserFeedbackProvider->addDataSource(new KUserFeedback::StartCountSource);
+    mUserFeedbackProvider->addDataSource(new KUserFeedback::UsageTimeSource);
+
+    mUserFeedbackProvider->addDataSource(new KUserFeedback::LocaleInfoSource);
 #endif