diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java
index 3afd5c4c22..aa417561aa 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapper.java
@@ -19,9 +19,16 @@ import static sonia.scm.api.v2.resources.ResourceLinks.user;
 @Mapper
 public abstract class GroupToGroupDtoMapper extends BaseMapper<Group, GroupDto> {
 
-  @Inject
   private UriInfoStore uriInfoStore;
 
+  GroupToGroupDtoMapper() {
+  }
+
+  @Inject
+  public GroupToGroupDtoMapper(UriInfoStore uriInfoStore) {
+    this.uriInfoStore = uriInfoStore;
+  }
+
   @AfterMapping
   void appendLinks(Group group, @MappingTarget GroupDto target) {
     Links.Builder linksBuilder = linkingTo().self(group(uriInfoStore.get()).self(target.getName()));
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java
index 115ff3dcd5..313fa0ce8b 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDtoToUserMapper.java
@@ -1,11 +1,7 @@
 package sonia.scm.api.v2.resources;
 
 import org.apache.shiro.authc.credential.PasswordService;
-import org.mapstruct.Context;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-import org.mapstruct.Named;
+import org.mapstruct.*;
 import sonia.scm.user.User;
 
 import javax.inject.Inject;
@@ -15,9 +11,16 @@ import static sonia.scm.api.rest.resources.UserResource.DUMMY_PASSWORT;
 @Mapper
 public abstract class UserDtoToUserMapper {
 
-  @Inject
   private PasswordService passwordService;
 
+  UserDtoToUserMapper() {
+  }
+
+  @Inject
+  public UserDtoToUserMapper(PasswordService passwordService) {
+    this.passwordService = passwordService;
+  }
+
   @Mappings({
     @Mapping(source = "password", target = "password", qualifiedByName = "encrypt"),
     @Mapping(target = "creationDate", ignore = true),
@@ -28,12 +31,9 @@ public abstract class UserDtoToUserMapper {
   @Named("encrypt")
   String encrypt(String password, @Context String originalPassword) {
 
-    if (DUMMY_PASSWORT.equals(password))
-    {
+    if (DUMMY_PASSWORT.equals(password)) {
       return originalPassword;
-    }
-    else
-    {
+    } else {
       return passwordService.encryptPassword(password);
     }
   }