2 files changed, 13 insertions, 13 deletions
diff --git a/sonar-ws/src/main/protobuf/ws-commons.proto b/sonar-ws/src/main/protobuf/ws-commons.proto
index 6f9c6805103..50a4fa4268c 100644
--- a/sonar-ws/src/main/protobuf/ws-commons.proto
+++ b/sonar-ws/src/main/protobuf/ws-commons.proto
@@ -72,17 +72,6 @@ enum RuleStatus {
   REMOVED = 3;
 }
 
-message User {
-  optional string login = 1;
-  optional string name = 2;
-  optional string email = 3;
-  optional bool active = 4;
-}
-
-message Users {
-  repeated User users = 1;
-}
-
 // Lines start at 1 and line offsets start at 0
 message TextRange {
   // Start line. Should never be absent
diff --git a/sonar-ws/src/main/protobuf/ws-issues.proto b/sonar-ws/src/main/protobuf/ws-issues.proto
index a2d1aa67a2f..361efbd4a92 100644
--- a/sonar-ws/src/main/protobuf/ws-issues.proto
+++ b/sonar-ws/src/main/protobuf/ws-issues.proto
@@ -41,7 +41,7 @@ message SearchWsResponse {
   repeated Issue issues = 6;
   repeated Component components = 7;
   optional sonarqube.ws.commons.Rules rules = 8;
-  optional sonarqube.ws.commons.Users users = 9;
+  optional Users users = 9;
 
   // Deprecated since 5.5, action plan has been removed
   optional ActionPlans unusedActionPlans = 10;
@@ -54,7 +54,7 @@ message Operation {
   optional Issue issue = 1;
   repeated Component components = 2;
   repeated sonarqube.ws.commons.Rule rules = 3;
-  repeated sonarqube.ws.commons.User users = 4;
+  repeated Users.User users = 4;
   // Deprecated since 5.5, action plan has been removed
   repeated ActionPlan actiunusedActionPlansonPlans = 5;
 }
@@ -211,5 +211,16 @@ message BulkChangeWsResponse {
   optional int64 failures = 4;
 }
 
+message Users {
+  repeated User users = 1;
+
+  message User {
+    optional string login = 1;
+    optional string name = 2;
+    optional string avatar = 3;
+    optional bool active = 4;
+  }
+}
+