diff --git a/vector/src/main/java/im/vector/app/AutoRageShaker.kt b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
index 7479b0421c..ca91f728cb 100644
--- a/vector/src/main/java/im/vector/app/AutoRageShaker.kt
+++ b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
@@ -185,7 +185,7 @@ class AutoRageShaker @Inject constructor(
                                                 "device_id" to target.senderDeviceId,
                                                 "user_id" to target.senderUserId,
                                                 "sender_key" to target.senderKey,
-                                                "matching_issue" to reportUrl
+                                                "recipient_rageshake" to reportUrl
                                         ).toContent()
                                 )
                             } catch (failure: Throwable) {
@@ -212,7 +212,7 @@ class AutoRageShaker @Inject constructor(
         val deviceId = event.content?.get("device_id")
         val userId = event.content?.get("user_id")
         val senderKey = event.content?.get("sender_key")
-        val matchingIssue = event.content?.get("matching_issue")?.toString() ?: ""
+        val matchingIssue = event.content?.get("recipient_rageshake")?.toString() ?: ""
 
         bugReporter.sendBugReport(
                 context = context,
@@ -233,7 +233,7 @@ class AutoRageShaker @Inject constructor(
                             append("\nuserId: $userId")
                             append("\nsessionId: $sessionId")
                         },
-                        "matching_issue" to matchingIssue
+                        "recipient_rageshake" to matchingIssue
                 ),
                 listener = null
         )
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 0ec36e43cc..26e9cabccb 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
@@ -340,13 +340,9 @@ class BugReporter @Inject constructor(
                         }
                         ReportType.SUGGESTION          -> builder.addFormDataPart("label", "[Suggestion]")
                         ReportType.SPACE_BETA_FEEDBACK -> builder.addFormDataPart("label", "spaces-feedback")
-                        ReportType.AUTO_UISI           -> {
-                            builder.addFormDataPart("label", "auto-uisis-receiver")
-                            builder.addFormDataPart("label", "auto-uisis")
-                        }
+                        ReportType.AUTO_UISI,
                         ReportType.AUTO_UISI_SENDER    -> {
-                            builder.addFormDataPart("label", "auto-uisis-sender")
-                            builder.addFormDataPart("label", "auto-uisis")
+                            builder.addFormDataPart("label", "Z-UISI")
                         }
                     }