diff --git a/app/controllers/OAuth.scala b/app/controllers/OAuth.scala
index 5bf390355b14e..6a50fee7a8b55 100644
--- a/app/controllers/OAuth.scala
+++ b/app/controllers/OAuth.scala
@@ -129,14 +129,16 @@ final class OAuth(env: Env, apiC: => Api) extends LilaController(env):
 
   def challengeTokens = ScopedBody(_.Web.Mod) { ctx ?=> me ?=>
     if isGranted(_.ApiChallengeAdmin) then
-      lila.oauth.OAuthTokenForm.adminChallengeTokens
+      lila.oauth.OAuthTokenForm
+        .adminChallengeTokens()
         .bindFromRequest()
         .fold(
           jsonFormError,
           data =>
-            env.oAuth.tokenApi.adminChallengeTokens(data, me).map { tokens =>
-              JsonOk(tokens.view.mapValues(_.plain).toMap)
-            }
+            env.oAuth.tokenApi
+              .adminChallengeTokens(data, me)
+              .map: tokens =>
+                JsonOk(tokens.view.mapValues(_.plain).toMap)
         )
     else Unauthorized(jsonError("Missing permission"))
   }
diff --git a/modules/game/src/main/GamesByUsersStream.scala b/modules/game/src/main/GamesByUsersStream.scala
index cf20f0f7b1c98..7d663835a4564 100644
--- a/modules/game/src/main/GamesByUsersStream.scala
+++ b/modules/game/src/main/GamesByUsersStream.scala
@@ -8,10 +8,7 @@ import lila.common.Bus
 import lila.common.Json.given
 import lila.db.dsl.given
 
-final class GamesByUsersStream(gameRepo: lila.game.GameRepo)(using
-    mat: akka.stream.Materializer,
-    ec: Executor
-):
+final class GamesByUsersStream(gameRepo: lila.game.GameRepo)(using akka.stream.Materializer, Executor):
 
   private val chans = List("startGame", "finishGame")
 
diff --git a/modules/oauth/src/main/OAuthTokenForm.scala b/modules/oauth/src/main/OAuthTokenForm.scala
index 75469db90b6d3..5aee8ff77d53a 100644
--- a/modules/oauth/src/main/OAuthTokenForm.scala
+++ b/modules/oauth/src/main/OAuthTokenForm.scala
@@ -21,11 +21,11 @@ object OAuthTokenForm:
 
   case class Data(description: String, scopes: List[String])
 
-  def adminChallengeTokens = Form(
+  def adminChallengeTokens(max: Int = 1000) = Form(
     mapping(
       "description" -> descriptionField,
       "users" -> cleanText
-        .verifying("No more than 500 users", _.split(',').size <= 500)
+        .verifying(s"No more than $max users", _.split(',').size <= max)
     )(AdminChallengeTokensData.apply)(unapply)
   )
 
diff --git a/modules/setup/src/main/SetupBulk.scala b/modules/setup/src/main/SetupBulk.scala
index 85c378e5197b0..0768cea694993 100644
--- a/modules/setup/src/main/SetupBulk.scala
+++ b/modules/setup/src/main/SetupBulk.scala
@@ -51,7 +51,7 @@ object SetupBulk:
     mapping(
       "players" -> nonEmptyText
         .verifying("Not enough tokens", t => extractTokenPairs(t).nonEmpty)
-        .verifying(s"Too many tokens (max: ${maxGames * 2})", t => extractTokenPairs(t).sizeIs < maxGames),
+        .verifying(s"Too many tokens (max: ${maxGames * 2})", t => extractTokenPairs(t).sizeIs <= maxGames),
       SetupForm.api.variant,
       SetupForm.api.clock,
       SetupForm.api.optionalDays,