diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go
index fb6f7aaa5..678acb2fd 100644
--- a/proxy/pkg/command/server.go
+++ b/proxy/pkg/command/server.go
@@ -227,6 +227,7 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic
 		middleware.AccountResolver(
 			middleware.Logger(l),
 			middleware.UserProvider(userProvider),
+			middleware.TokenManagerConfig(cfg.TokenManager),
 			middleware.UserOIDCClaim(cfg.UserOIDCClaim),
 			middleware.UserCS3Claim(cfg.UserCS3Claim),
 			middleware.AutoprovisionAccounts(cfg.AutoprovisionAccounts),
@@ -241,6 +242,7 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic
 		// finally, trigger home creation when a user logs in
 		middleware.CreateHome(
 			middleware.Logger(l),
+			middleware.TokenManagerConfig(cfg.TokenManager),
 			middleware.RevaGatewayClient(revaClient),
 		),
 	)
diff --git a/proxy/pkg/user/backend/accounts.go b/proxy/pkg/user/backend/accounts.go
index 2c599ac9a..d05a69465 100644
--- a/proxy/pkg/user/backend/accounts.go
+++ b/proxy/pkg/user/backend/accounts.go
@@ -66,19 +66,17 @@ func (a accountsServiceBackend) GetUserByClaims(ctx context.Context, claim, valu
 
 	user := a.accountToUser(account)
 
+	if withRoles {
+		if err := injectRoles(ctx, user, a.settingsRoleService); err != nil {
+			a.logger.Warn().Err(err).Msgf("Could not load roles... continuing without")
+		}
+	}
+
 	token, err := a.generateToken(ctx, user)
 	if err != nil {
 		return nil, "", err
 	}
 
-	if !withRoles {
-		return user, token, nil
-	}
-
-	if err := injectRoles(ctx, user, a.settingsRoleService); err != nil {
-		a.logger.Warn().Err(err).Msgf("Could not load roles... continuing without")
-	}
-
 	return user, token, nil
 
 }
@@ -178,7 +176,7 @@ func (a *accountsServiceBackend) getAccount(ctx context.Context, query string) (
 	})
 
 	if err != nil {
-		a.logger.Error().Err(err).Str("query", query).Msgf("error fetching from accounts-service %+v", a.tokenManager)
+		a.logger.Error().Err(err).Str("query", query).Msgf("error fetching from accounts-service")
 		status = http.StatusInternalServerError
 		return
 	}