diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
index 3fc33f20c7..fe1eb95dc7 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
@@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory;
 
 import sonia.scm.SCMContext;
 import sonia.scm.ScmState;
-import sonia.scm.Type;
 import sonia.scm.repository.RepositoryManager;
 import sonia.scm.user.User;
 import sonia.scm.web.security.WebSecurityContext;
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
index 14d212766f..923102bd44 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
@@ -59,7 +59,6 @@ import java.util.Collection;
 import javax.servlet.http.HttpServletRequest;
 
 import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
 
 /**
  *
@@ -82,15 +81,18 @@ public class RepositoryResource extends AbstractResource<Repository>
    * @param configuration
    * @param repositoryManager
    * @param securityContextProvider
+   * @param requestProvider
    */
   @Inject
   public RepositoryResource(
           ScmConfiguration configuration, RepositoryManager repositoryManager,
-          Provider<WebSecurityContext> securityContextProvider)
+          Provider<WebSecurityContext> securityContextProvider,
+          Provider<HttpServletRequest> requestProvider)
   {
     this.configuration = configuration;
     this.repositoryManager = repositoryManager;
     this.securityContextProvider = securityContextProvider;
+    this.requestProvider = requestProvider;
   }
 
   //~--- methods --------------------------------------------------------------
@@ -227,6 +229,7 @@ public class RepositoryResource extends AbstractResource<Repository>
 
     if (handler != null)
     {
+      HttpServletRequest request = requestProvider.get();
       StringBuilder url = new StringBuilder(request.getScheme());
 
       url.append("://").append(configuration.getServername());
@@ -290,9 +293,8 @@ public class RepositoryResource extends AbstractResource<Repository>
   /** Field description */
   private RepositoryManager repositoryManager;
 
-  /** TODO path request direct to method */
-  @Context
-  private HttpServletRequest request;
+  /** Field description */
+  private Provider<HttpServletRequest> requestProvider;
 
   /** Field description */
   private Provider<WebSecurityContext> securityContextProvider;