diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/JSONContextResolver.java b/scm-webapp/src/main/java/sonia/scm/api/rest/JSONContextResolver.java
index 1688e8aa0b..8a72911bc9 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/JSONContextResolver.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/JSONContextResolver.java
@@ -43,7 +43,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 
@@ -54,7 +53,7 @@ import javax.ws.rs.ext.Provider;
  * @since 2.0.0
  */
 @Provider
-@Produces(MediaType.APPLICATION_JSON)
+@Produces("application/*+json")
 public final class JSONContextResolver implements ContextResolver<ObjectMapper> {
 
   private final ObjectMapper mapper;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
index 7bcf517edc..ca15f6169b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserCollectionResource.java
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Singleton
-@Produces(MediaType.APPLICATION_JSON)
+@Produces("application/vnd.scmm-user+json")
 public class UserCollectionResource extends AbstractManagerResource<User, UserException> {
   private final UserDto2UserMapper dtoToUserMapper;
   private final User2UserDtoMapper userToDtoMapper;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java
index bdcecabe96..f2d97568a6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserSubResource.java
@@ -17,7 +17,7 @@ import javax.ws.rs.core.*;
 import java.util.Collection;
 
 @Singleton
-@Produces(MediaType.APPLICATION_JSON)
+@Produces("application/vnd.scmm-user+json")
 public class UserSubResource extends AbstractManagerResource<User, UserException> {
   private final UserDto2UserMapper dtoToUserMapper;
   private final User2UserDtoMapper userToDtoMapper;