diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index bc48b4addb..d6a111096e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -377,7 +377,6 @@ class HomeActivity :
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            /*
             R.id.menu_home_suggestion -> {
                 bugReporter.openBugReportScreen(this, true)
                 return true
@@ -386,7 +385,6 @@ class HomeActivity :
                 bugReporter.openBugReportScreen(this, false)
                 return true
             }
-             */
             R.id.menu_home_init_sync_legacy -> {
                 // Configure the SDK
                 initialSyncStrategy = InitialSyncStrategy.Legacy
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 15fd18039b..66aba57756 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -246,7 +246,7 @@ class BugReporter @Inject constructor(
                 }
 
                 if (!mIsCancelled) {
-                    val text = "[Element] " +
+                    val text = "[SchildiChat] " +
                             if (forSuggestion) {
                                 "[Suggestion] "
                             } else {
@@ -257,7 +257,7 @@ class BugReporter @Inject constructor(
                     // build the multi part request
                     val builder = BugReporterMultipartBody.Builder()
                             .addFormDataPart("text", text)
-                            .addFormDataPart("app", "riot-android")
+                            .addFormDataPart("app", "schildichat-android")
                             .addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
                             .addFormDataPart("user_id", userId)
                             .addFormDataPart("device_id", deviceId)
@@ -319,7 +319,7 @@ class BugReporter @Inject constructor(
                     builder.addFormDataPart("label", context.getString(R.string.git_branch_name))
 
                     // Special for RiotX
-                    builder.addFormDataPart("label", "[Element]")
+                    builder.addFormDataPart("label", "[SchildiChat]")
 
                     // Suggestion
                     if (forSuggestion) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index b42e19444b..6d9b24469e 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -861,7 +861,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
      * @return true if the rage shake is used
      */
     fun useRageshake(): Boolean {
-        return false; //defaultPrefs.getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, false)
+        return defaultPrefs.getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, false)
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index 50993c86be..a1759ebfa7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -109,12 +109,12 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                         } else {
                             views.toubleshootSummDescription.text = getString(R.string.settings_troubleshoot_diagnostic_failure_status_no_quickfix)
                         }
-                        //views.troubleshootSummButton.visibility = View.VISIBLE
+                        views.troubleshootSummButton.visibility = View.VISIBLE
                         views.troubleshootRunButton.visibility = View.VISIBLE
                     }
                     TroubleshootTest.TestStatus.SUCCESS          -> {
                         views.toubleshootSummDescription.text = getString(R.string.settings_troubleshoot_diagnostic_success_status)
-                        //views.troubleshootSummButton.visibility = View.VISIBLE
+                        views.troubleshootSummButton.visibility = View.VISIBLE
                         views.troubleshootRunButton.visibility = View.VISIBLE
                     }
                 }
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index 4b6fc5eeb3..f974db9052 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -9,7 +9,6 @@
         android:title="@string/settings"
         app:showAsAction="never" />
 
-<!--
     <item
         android:id="@+id/menu_home_suggestion"
         android:icon="@drawable/ic_material_bug_report"
@@ -19,7 +18,6 @@
         android:id="@+id/menu_home_report_bug"
         android:icon="@drawable/ic_material_bug_report"
         android:title="@string/send_bug_report" />
--->
 
     <item
         android:id="@+id/menu_home_init_sync_legacy"
diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
index 600953abc0..48f74f30aa 100755
--- a/vector/src/main/res/values/config.xml
+++ b/vector/src/main/res/values/config.xml
@@ -6,7 +6,7 @@
     <!-- server urls -->
     <string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
     <string name="piwik_server_url" translatable="false">https://piwik.nonexistent.localhost</string>
-    <string name="bug_report_url" translatable="false">https://nonexistent.localhost/bugreports/submit</string>
+    <string name="bug_report_url" translatable="false">https://s2.spiritcroc.de/api/submit</string>
 
     <!--
         Pusher config for the application
diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
index 6ae0e9b4fa..eed85fd0a5 100644
--- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -40,8 +40,7 @@
 
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_RAGE_SHAKE_CATEGORY_KEY"
-        android:title="@string/settings_rageshake"
-        android:enabled="false">
+        android:title="@string/settings_rageshake">
 
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"