diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 5928ce9fb..615626176 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -255,7 +255,10 @@ define(function () {
     out.settings_resetTips = "Tips in CryptDrive";
     out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
     out.settings_resetTipsDone = "All the tips are now visible again.";
-    out.settings_userFeedback = "disable user feedback";
+
+    out.settings_userFeedbackHint1 = "CryptPad provides some very basic feedback to the server, to let us know how to improve your experience.";
+    out.settings_userFeedbackHint2 = "Your pad's content will never be shared with the server.";
+    out.settings_userFeedback = "Disable user feedback";
 
     // index.html
 
diff --git a/www/settings/main.js b/www/settings/main.js
index b28485531..d52716063 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -9,7 +9,7 @@ define([
 
     var USERNAME_KEY = 'cryptpad.username';
 
-    var APP = {
+    var APP = window.APP = {
         Cryptpad: Cryptpad,
         _onRefresh: []
     };
@@ -173,14 +173,18 @@ define([
         var $label = $('<label>', { 'for': 'userFeedback'})
             .text(Messages.settings_userFeedback);
 
+        $div.html('<hr />' + Messages.settings_userFeedbackHint1 + '<br />' +
+            Messages.settings_userFeedbackHint2).appendTo($div);
+
         $('<br>').appendTo($div);
 
         var $checkbox = $('<input>', {
             'type': 'checkbox',
         }).on('change', function () {
             obj.proxy.allowUserFeedback = $checkbox.is(':checked') || false;
-            console.log("wut");
-            console.log($box.is(':checked'));
+
+            // TODO provide feedback to show if this is synced
+            settle(function () {});
         });
 
         $checkbox.appendTo($div);