diff --git a/docs/config.md b/docs/config.md
index 2cfda9a6..d68ddb27 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -295,7 +295,7 @@ want to use a dedicated token to publish from your backup host, and one from you
     but not yet implemented.
 
 The `ntfy token` command can be used to manage access tokens for users. Tokens can have labels, and they can expire
-automatically (or never expire). Each user can have up to 20 tokens (hardcoded). 
+automatically (or never expire). Each user can have up to 60 tokens (hardcoded). 
 
 **Example commands** (type `ntfy token --help` or `ntfy token COMMAND --help` for more details):
 ```
diff --git a/docs/releases.md b/docs/releases.md
index dabe9c2b..1ef7235c 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -1397,6 +1397,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 * WebSocket returning incorrect HTTP error code ([#1338](https://github.com/binwiederhier/ntfy/pull/1338) / [#1337](https://github.com/binwiederhier/ntfy/pull/1337), thanks to [@wunter8](https://github.com/wunter8) for debugging and implementing)
 * Make Markdown in the web app scrollable horizontally ([#1262](https://github.com/binwiederhier/ntfy/pull/1262), thanks to [@rake5k](https://github.com/rake5k) for fixing)
 * Make sure WebPush subscription topics are actually deleted (no ticket)
+* Increase the number of access tokens per user to 60 ([#1308](https://github.com/binwiederhier/ntfy/issues/1308))
 
 **Documentation:**
 
diff --git a/user/manager.go b/user/manager.go
index 59c8d51f..814ee827 100644
--- a/user/manager.go
+++ b/user/manager.go
@@ -28,7 +28,7 @@ const (
 	userHardDeleteAfterDuration     = 7 * 24 * time.Hour
 	tokenPrefix                     = "tk_"
 	tokenLength                     = 32
-	tokenMaxCount                   = 20 // Only keep this many tokens in the table per user
+	tokenMaxCount                   = 60 // Only keep this many tokens in the table per user
 	tag                             = "user_manager"
 )