diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/WebClientConfiguration.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/WebClientConfiguration.java
index 39cbe7a21c86f130ab9688166492a15b2b750950..454f52e0b89cf51700af6a0ed6a723972c1958e7 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/WebClientConfiguration.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/WebClientConfiguration.java
@@ -33,6 +33,14 @@ public class WebClientConfiguration {
 	@Primary
 	ServerOAuth2AuthorizedClientExchangeFilterFunction serverOAuth2AuthorizedClientExchangeFilterFunction(
 			ReactiveClientRegistrationRepository clientRegistrations) {
+
+		var oauth = new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager(clientRegistrations));
+		oauth.setDefaultClientRegistrationId("osi2");
+		return oauth;
+	}
+
+	AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager authorizedClientManager(
+			ReactiveClientRegistrationRepository clientRegistrations) {
 		var clientService = new InMemoryReactiveOAuth2AuthorizedClientService(
 				clientRegistrations);
 		var authorizedClientManager = new AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager(
@@ -43,10 +51,7 @@ public class WebClientConfiguration {
 						.clientCredentials()
 						.build());
 
-		var oauth = new ServerOAuth2AuthorizedClientExchangeFilterFunction(
-				authorizedClientManager);
-		oauth.setDefaultClientRegistrationId("osi2");
-		return oauth;
+		return authorizedClientManager;
 	}
 
 }