diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/PreAuthProvider.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/PreAuthProvider.java
index 2aed9dbe..ed561890 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/PreAuthProvider.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/PreAuthProvider.java
@@ -10,12 +10,16 @@ package ch.ethz.seb.sebserver.webservice.weblayer.oauth;
 
 import javax.annotation.PostConstruct;
 
+import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider;
 import org.springframework.stereotype.Component;
 
 import ch.ethz.seb.sebserver.webservice.weblayer.WebServiceUserDetails;
 
+@Lazy
 @Component
+@WebServiceProfile
 public class PreAuthProvider extends PreAuthenticatedAuthenticationProvider {
 
     private final WebServiceUserDetails webServiceUserDetails;