diff --git a/pom.xml b/pom.xml
index ce0324ada..23a97717d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
 		<dependency>
 			<groupId>io.github.coffeelibs</groupId>
 			<artifactId>tiny-oauth2-client</artifactId>
-			<version>0.1.1</version>
+			<version>0.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.auth0</groupId>
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java b/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
index b9b4fdf0b..180a51ef0 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
@@ -28,8 +28,9 @@ class AuthFlowTask extends Task<String> {
 
 	@Override
 	protected String call() throws IOException, InterruptedException {
-		// TODO configure redirectURIs with deviceId from authFlowContext
 		var response = AuthFlow.asClient(hubConfig.clientId) //
+				.withSuccessRedirect(URI.create(hubConfig.authSuccessUrl + "&device=" + authFlowContext.deviceId())) //
+				.withErrorRedirect(URI.create(hubConfig.authErrorUrl + "&device=" + authFlowContext.deviceId())) //
 				.authorize(URI.create(hubConfig.authEndpoint), redirectUriConsumer) //
 				.getAccessToken(URI.create(hubConfig.tokenEndpoint));
 		var json = JsonParser.parseString(response);