diff --git a/docs/core/admin/doveadm.md b/docs/core/admin/doveadm.md
index 03a3b1556..a9cd242e2 100644
--- a/docs/core/admin/doveadm.md
+++ b/docs/core/admin/doveadm.md
@@ -293,7 +293,7 @@ guarantees that two backend servers don't attempt to modify the same user's
 mailbox at the same time (which might cause problems).
 
 ::: warning [[changed,doveadm_mailbox_commands_user]]
-All mail commands require providing `-u`, `-F` or `-A` parameter.
+All mail commands require providing `-u` or `-F` parameter.
 
 `USER` environment variable is no longer supported.
 
diff --git a/docs/core/config/auth/databases/ldap.md b/docs/core/config/auth/databases/ldap.md
index 8384e29d1..ca3996a8e 100644
--- a/docs/core/config/auth/databases/ldap.md
+++ b/docs/core/config/auth/databases/ldap.md
@@ -395,7 +395,7 @@ userdb ldap {
 
 ### User Iteration
 
-For using `doveadm -A` or `-u` with wildcards:
+For using `doveadm -u` with wildcards:
 ```
 ldap_uris = ldap://ldap.example.org
 ldap_auth_dn = cn=admin,dc=example,dc=org
diff --git a/docs/core/config/auth/databases/lua.md b/docs/core/config/auth/databases/lua.md
index bd3340a07..caee070c3 100644
--- a/docs/core/config/auth/databases/lua.md
+++ b/docs/core/config/auth/databases/lua.md
@@ -340,7 +340,7 @@ end
 ```
 
 If you also want to be able to list users, so that you could use
-`doveadm cmd -A`:
+`doveadm cmd -u "*"`:
 
 ```lua:line-numbers
 local database = "/path/to/file"
diff --git a/docs/core/config/auth/databases/sql.md b/docs/core/config/auth/databases/sql.md
index 3f9a58958..c2f2fbaa2 100644
--- a/docs/core/config/auth/databases/sql.md
+++ b/docs/core/config/auth/databases/sql.md
@@ -111,7 +111,7 @@ mail_gid = vmail
 
 ## User Iteration
 
-Some commands, such as `doveadm -A` need to get a list of users. With SQL
+Some commands (using `-u "*"`) need to get a list of users. With SQL
 userdb this is done with the [[setting,userdb_sql_iterate_query]] setting.
 
 You can either return:
@@ -195,7 +195,7 @@ userdb sql {
   query = SELECT home, uid, gid \
     FROM users \
     WHERE userid = '%{user | username}' AND domain = '%{user | domain}'
-  # For using doveadm -A:
+  # For using doveadm -u "*":
   iterate_query = SELECT userid AS username, domain FROM users
 }
 ```
@@ -226,7 +226,7 @@ userdb sql {
   query = SELECT home, uid, gid \
     FROM users \
     WHERE userid = '%{user | username}' AND domain = '%{user | domain}'
-  # For using doveadm -A:
+  # For using doveadm -u "*":
   iterate_query = SELECT userid AS username, domain FROM users
 }
 ```
@@ -248,7 +248,7 @@ userdb sql {
   query = SELECT home, uid, gid \
     FROM users \
     WHERE userid = '%{user | username}' AND domain = '%{user | domain}'
-  # For using doveadm -A:
+  # For using doveadm -u "*":
   iterate_query = SELECT userid AS username, domain FROM users
 }
 ```
diff --git a/docs/core/man/doveadm-acl.1.md b/docs/core/man/doveadm-acl.1.md
index feb651dde..07b2c3a0b 100644
--- a/docs/core/man/doveadm-acl.1.md
+++ b/docs/core/man/doveadm-acl.1.md
@@ -21,8 +21,6 @@ This command uses by default the output formatter **table**.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
@@ -116,7 +114,7 @@ This command uses by default the output formatter **table**.
 ### acl add
 
 **doveadm** [*GLOBAL OPTIONS*] acl add
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox id* *right*
   [*right* ...]
@@ -127,7 +125,7 @@ existing rights are preserved.
 ### acl debug
 
 **doveadm** [*GLOBAL OPTIONS*] acl debug
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox*
 
@@ -137,7 +135,7 @@ to the user. It will list exactly what the problem is.
 ### acl delete
 
 **doveadm** [*GLOBAL OPTIONS*] acl delete
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox id*
 
@@ -146,7 +144,7 @@ Remove the whole ACL entry for the *mailbox*/*id*.
 ### acl get
 
 **doveadm** [*GLOBAL OPTIONS*] acl get
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-m**]
   *mailbox*
@@ -159,7 +157,7 @@ Show all the ACLs for the *mailbox*.
 ### acl recalc
 
 **doveadm** [*GLOBAL OPTIONS*] acl recalc
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
 
 Make sure the *user*'s shared mailboxes exist correctly in the
@@ -168,7 +166,7 @@ Make sure the *user*'s shared mailboxes exist correctly in the
 ### acl remove
 
 **doveadm** [*GLOBAL OPTIONS*] acl remove
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox id* *right* [*right* ...]
 
@@ -178,7 +176,7 @@ are removed, the entry still exists without any rights.
 ### acl rights
 
 **doveadm** [*GLOBAL OPTIONS*] acl rights
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox*
 
@@ -187,7 +185,7 @@ Show the *user*'s current ACL rights for the *mailbox*.
 ### acl set
 
 **doveadm** [*GLOBAL OPTIONS*] acl set
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox id* *right* [*right* ...]
 
diff --git a/docs/core/man/doveadm-altmove.1.md b/docs/core/man/doveadm-altmove.1.md
index f9889cdde..28489d254 100644
--- a/docs/core/man/doveadm-altmove.1.md
+++ b/docs/core/man/doveadm-altmove.1.md
@@ -8,11 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **altmove**
-  [**-r**]
-  [**-S** *socket_path*]
-  **-A** *search_query*
-
 **doveadm** [*GLOBAL OPTIONS*] **altmove**
   [**-r**]
   [**-S** *socket_path*]
@@ -49,8 +44,6 @@ moved to the alternative storage.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-deduplicate.1.md b/docs/core/man/doveadm-deduplicate.1.md
index 650af7bd2..1e78c931c 100644
--- a/docs/core/man/doveadm-deduplicate.1.md
+++ b/docs/core/man/doveadm-deduplicate.1.md
@@ -9,7 +9,7 @@ dovecotComponent: core
 ## SYNOPSIS
 
 **doveadm** [*GLOBAL OPTIONS*] **deduplicate**
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-m**]
   *search_query*
@@ -28,8 +28,6 @@ Deduplication across multiple mailboxes is not supported.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-expunge.1.md b/docs/core/man/doveadm-expunge.1.md
index 96f4c90f6..123aaefd6 100644
--- a/docs/core/man/doveadm-expunge.1.md
+++ b/docs/core/man/doveadm-expunge.1.md
@@ -8,11 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **expunge**
-  [**-S** *socket_path*]
-  [**-d**]
-  **-A** *search_query*
-
 **doveadm** [*GLOBAL OPTIONS*] **expunge**
   [**-S** *socket_path*]
   [**-d**]
@@ -50,8 +45,6 @@ expunged.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 **-d**
 :   Delete the mailbox if it is empty after expunging.
 
diff --git a/docs/core/man/doveadm-fetch.1.md b/docs/core/man/doveadm-fetch.1.md
index e583b82e4..6be886427 100644
--- a/docs/core/man/doveadm-fetch.1.md
+++ b/docs/core/man/doveadm-fetch.1.md
@@ -10,7 +10,7 @@ dovecotComponent: core
 
 **doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **fetch**
   [**-S** *socket_path*]
-  **-A** *fields* *search_query*
+  *fields* *search_query*
 
 **doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **fetch**
   [**-S** *socket_path*]
@@ -38,8 +38,6 @@ This command uses by default the output formatter **pager**.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-flags.1.md b/docs/core/man/doveadm-flags.1.md
index 167d6929f..132f06c55 100644
--- a/docs/core/man/doveadm-flags.1.md
+++ b/docs/core/man/doveadm-flags.1.md
@@ -10,7 +10,7 @@ dovecotComponent: core
 
 **doveadm** [*GLOBAL OPTIONS*] **flags**
   [**-S** *socket_path*]
-  **-A** *command flags* *search_query*
+  *command flags* *search_query*
 
 **doveadm** [*GLOBAL OPTIONS*] **flags**
   [**-S** *socket_path*]
@@ -32,8 +32,6 @@ This command is used to manipulate flags of messages.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
@@ -62,7 +60,7 @@ This command is used to manipulate flags of messages.
 ### flags add
 
 **doveadm** [*GLOBAL OPTIONS*] flags add
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *flags search_query*
 
@@ -72,7 +70,7 @@ This command is used to extend the current set of flags with the given
 ### flags remove
 
 **doveadm** [*GLOBAL OPTIONS*] flags remove
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *flags search_query*
 
@@ -82,7 +80,7 @@ this command.
 ### flags replace
 
 **doveadm** [*GLOBAL OPTIONS*] flags replace
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *flags search_query*
 
diff --git a/docs/core/man/doveadm-force-resync.1.md b/docs/core/man/doveadm-force-resync.1.md
index 3ee7a1a4e..1bb3037b0 100644
--- a/docs/core/man/doveadm-force-resync.1.md
+++ b/docs/core/man/doveadm-force-resync.1.md
@@ -8,10 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **force-resync**
-  [**-S** *socket_path*]
-  **-A** *mailbox*
-
 **doveadm** [*GLOBAL OPTIONS*] **force-resync**
   [**-S** *socket_path*]
   **-F** *file* *mailbox*
@@ -36,8 +32,6 @@ also checked.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-fts.1.md b/docs/core/man/doveadm-fts.1.md
index ede553435..251be0ad0 100644
--- a/docs/core/man/doveadm-fts.1.md
+++ b/docs/core/man/doveadm-fts.1.md
@@ -22,8 +22,6 @@ This command uses by default the output formatter **flow** (without the
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
@@ -43,7 +41,7 @@ This command uses by default the output formatter **flow** (without the
 ### fts optimize
 
 **doveadm** [*GLOBAL OPTIONS*] fts optimize
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [*namespace*]
 
@@ -53,7 +51,7 @@ the full text search engines, but this enforces it to happen.
 ### fts rescan
 
 **doveadm** [*GLOBAL OPTIONS*] fts rescan
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [*namespace*]
 
diff --git a/docs/core/man/doveadm-import.1.md b/docs/core/man/doveadm-import.1.md
index e6138412b..9c91b742d 100644
--- a/docs/core/man/doveadm-import.1.md
+++ b/docs/core/man/doveadm-import.1.md
@@ -8,13 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **import**
-  [**-S** *socket_path*]
-  [**-U** *source_user*]
-  [**-s**]
-  **-A**
-  *source_mail_driver*:*source_mail_path*
-
 **doveadm** [*GLOBAL OPTIONS*] **import**
   [**-S** *socket_path*]
   [**-U** *source_user*]
@@ -58,8 +51,6 @@ In the final form, the mails will be imported only for given *user* (s).
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-index.1.md b/docs/core/man/doveadm-index.1.md
index e3dede7da..8ec6e8de5 100644
--- a/docs/core/man/doveadm-index.1.md
+++ b/docs/core/man/doveadm-index.1.md
@@ -8,13 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **index**
-  [**-S** *socket_path*]
-  **-A**
-  [**-q**]
-  [**-n** *max_recent*]
-  *mailbox*
-
 **doveadm** [*GLOBAL OPTIONS*] **index**
   [**-S** *socket_path*]
   **-F** *file*
@@ -59,8 +52,6 @@ fts_autoindex = yes
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 **-n** *max_recent*
diff --git a/docs/core/man/doveadm-mailbox-cryptokey.1.md b/docs/core/man/doveadm-mailbox-cryptokey.1.md
index 377caf4b6..f616d297b 100644
--- a/docs/core/man/doveadm-mailbox-cryptokey.1.md
+++ b/docs/core/man/doveadm-mailbox-cryptokey.1.md
@@ -31,8 +31,6 @@ active.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-mailbox.1.md b/docs/core/man/doveadm-mailbox.1.md
index 7e5c68eec..1daa1a815 100644
--- a/docs/core/man/doveadm-mailbox.1.md
+++ b/docs/core/man/doveadm-mailbox.1.md
@@ -23,8 +23,6 @@ dovecotComponent: core
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
@@ -47,7 +45,7 @@ dovecotComponent: core
 ### mailbox create
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox create
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-g** *guid*]
   [**-s**]
@@ -75,7 +73,7 @@ Please see [[man,doveadm-mailbox-cryptokey]] for more details.
 ### mailbox delete
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox delete
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   [**-r**]
@@ -105,7 +103,7 @@ contains. If the mailbox has any children, they won't be deleted, unless
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox list
   [**-7** | **-8**]
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   [*mailbox* ...]
@@ -126,7 +124,7 @@ already deleted.
 ### mailbox metadata list
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox metadata list
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   [**-p**]
@@ -151,7 +149,7 @@ already deleted.
 ### mailbox metadata get
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox metadata get
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   *mailbox* *key*
@@ -171,7 +169,7 @@ already deleted.
 ### mailbox metadata set
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox metadata set
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   *mailbox* *key* *value*
@@ -194,7 +192,7 @@ already deleted.
 ### mailbox metadata unset
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox metadata unset
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   *mailbox* *key*
@@ -233,7 +231,9 @@ Convention).
 
 ### mailbox path
 
-**doveadm** [*GLOBAL OPTIONS*] mailbox path [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**] [**-S** *socket_path*] [**-s**] [**-t** *type*] *mailbox*
+**doveadm** [*GLOBAL OPTIONS*] mailbox path
+[**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+[**-S** *socket_path*] [**-s**] [**-t** *type*] *mailbox*
 
 The **mailbox path** command returns the filesystem path for the given
 mailbox.  By default, this is the path to the "index" directory.
@@ -257,7 +257,7 @@ mailbox.  By default, this is the path to the "index" directory.
 ### mailbox rename
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox rename
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-s**]
   *old_name* *new_name*
@@ -271,7 +271,7 @@ When the **-s** option is given, *old_name* will be unsubscribed and
 ### mailbox status
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox status
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-t**]
   *fields* *mailbox*...
@@ -330,7 +330,7 @@ This command uses by default the output *formatter* **flow**.
 ### mailbox subscribe
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox subscribe
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox* *...*
 
@@ -339,7 +339,7 @@ This command is used to subscribe one or more mailboxes.
 ### mailbox unsubscribe
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox unsubscribe
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox* *...*
 
@@ -348,7 +348,7 @@ This command is used to unsubscribe one or more mailboxes.
 ### mailbox update
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox update
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-\-mailbox-guid** *guid*]
   [**-\-uid-validity** *uid*]
@@ -368,7 +368,7 @@ is not supported for all mail backends.
 ### mailbox cache purge
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox cache purge
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *mailbox* *...*
 
@@ -380,7 +380,7 @@ automatically.
 ### mailbox cache decision
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox cache decision
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-\-all**]
   [**-\-fields** *list of fields*]
@@ -413,7 +413,7 @@ cache.
 ### mailbox cache remove
 
 **doveadm** [*GLOBAL OPTIONS*] mailbox cache remove
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *search query*
 
diff --git a/docs/core/man/doveadm-purge.1.md b/docs/core/man/doveadm-purge.1.md
index 1fb1758f8..717d2f568 100644
--- a/docs/core/man/doveadm-purge.1.md
+++ b/docs/core/man/doveadm-purge.1.md
@@ -8,10 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **purge**
-  [**-S** *socket_path*]
-  **-A**
-
 **doveadm** [*GLOBAL OPTIONS*] **purge**
   [**-S** *socket_path*]
   **-F** *file*
@@ -46,8 +42,6 @@ In the last form, only messages of the given *user* (s) will be purged.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-quota.1.md b/docs/core/man/doveadm-quota.1.md
index 0d7cccbd7..bbadc3c9c 100644
--- a/docs/core/man/doveadm-quota.1.md
+++ b/docs/core/man/doveadm-quota.1.md
@@ -8,10 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **quota**
-  [**-S** *socket_path*]
-  *command* **-A**
-
 **doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **quota**
   [**-S** *socket_path*]
   *command* **-F** *file*
@@ -43,8 +39,6 @@ In the last form, the command will affect only the matching *user*(s).
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
@@ -58,7 +52,7 @@ In the last form, the command will affect only the matching *user*(s).
 ### quota get
 
 **doveadm** [*GLOBAL OPTIONS*] **quota get**
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
 
 The **quota get** command is used to display the current quota usage.
 The storage values are reported in kilobytes.
@@ -68,7 +62,7 @@ This command uses by default the output formatter **table**.
 ### quota recalc
 
 **doveadm** [*GLOBAL OPTIONS*] quota recalc
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
 
 The **quota recalc** command is used to recalculate the current quota
 usage.
diff --git a/docs/core/man/doveadm-rebuild.1.md b/docs/core/man/doveadm-rebuild.1.md
index 2f78204d7..71f355deb 100644
--- a/docs/core/man/doveadm-rebuild.1.md
+++ b/docs/core/man/doveadm-rebuild.1.md
@@ -8,10 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **rebuild** \<command\>
-  [**-S** *socket_path*]
-  **-A** *search_query*
-
 **doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **rebuild** \<command\>
   [**-S** *socket_path*]
   **-F** *file* *search_query*
@@ -29,7 +25,7 @@ dovecotComponent: core
 The **rebuild attachments** command is used to rebuilds attachment
 presence. [[man,doveadm]] will print the message's uid for each match.
 
-When used with the **-A** or **-u** *wildcard* options,
+When used with the **-u** *wildcard* option,
 [[man,doveadm]] will print the fields **username** and **uid** for
 each matching message.
 
@@ -52,8 +48,6 @@ This command uses by default the output formatter **flow** (without the
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-save.1.md b/docs/core/man/doveadm-save.1.md
index c09fc956a..8d34c7846 100644
--- a/docs/core/man/doveadm-save.1.md
+++ b/docs/core/man/doveadm-save.1.md
@@ -8,15 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **save**
-  [**-S** *socket_path*]
-  **-A**
-  [*-m* *mailbox*]
-  [*-U* *uid*]
-  [*-g* *guid*]
-  [*-r* *received-date*]
-  [*mail-file*]
-
 **doveadm** [*GLOBAL OPTIONS*] **save**
   [**-S** *socket_path*]
   **-F** *file*
@@ -54,8 +45,6 @@ quota is enforced.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-search.1.md b/docs/core/man/doveadm-search.1.md
index 31f227297..aa15e42d5 100644
--- a/docs/core/man/doveadm-search.1.md
+++ b/docs/core/man/doveadm-search.1.md
@@ -8,10 +8,6 @@ dovecotComponent: core
 
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **search**
-  [**-S** *socket_path*]
-  **-A** *search_query*
-
 **doveadm** [*GLOBAL OPTIONS*] [**-f** *formatter*] **search**
   [**-S** *socket_path*]
   **-F** *file* *search_query*
@@ -30,7 +26,7 @@ The **search** command is used to find matching messages.
 [[man,doveadm]] will print the mailbox's guid and the message's uid
 for each match.
 
-When used with the **-A** or **-u** *wildcard* options,
+When used with the **-u** *wildcard* option,
 [[man,doveadm]] will print the fields **username**, **mailbox-guid**
 and **uid** for each matching message.
 
@@ -53,8 +49,6 @@ This command uses by default the output formatter **flow** (without the
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/doveadm-sieve.1.md b/docs/core/man/doveadm-sieve.1.md
index ec266c07c..f237d07a2 100644
--- a/docs/core/man/doveadm-sieve.1.md
+++ b/docs/core/man/doveadm-sieve.1.md
@@ -22,8 +22,6 @@ The **doveadm sieve** commands can be used to manage Sieve filtering.
 
 ## OPTIONS
 
-<!-- @include: include/option-A.inc -->
-
 <!-- @include: include/option-F-file.inc -->
 
 <!-- @include: include/option-no-userdb-lookup.inc -->
@@ -47,7 +45,7 @@ The **doveadm sieve** commands can be used to manage Sieve filtering.
 ### sieve put
 
 **doveadm** [*GLOBAL OPTIONS*] sieve put
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-a**]
   *scriptname*
@@ -61,7 +59,7 @@ for execution at delivery.
 ### sieve get
 
 **doveadm** [*GLOBAL OPTIONS*] sieve get
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *scriptname*
 
@@ -70,7 +68,7 @@ This command retrieves the Sieve script named *scriptname*.
 ### sieve delete
 
 **doveadm** [*GLOBAL OPTIONS*] sieve delete
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-a**]
   *scriptname* ...
@@ -81,7 +79,7 @@ not be the active script, unless the **-a** option is present.
 ### sieve list
 
 **doveadm** [*GLOBAL OPTIONS*] sieve list
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
 
 List existing Sieve scripts, and their active state.
@@ -89,7 +87,7 @@ List existing Sieve scripts, and their active state.
 ### sieve rename
 
 **doveadm** [*GLOBAL OPTIONS*] sieve rename
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *old_name* *new_name*
 
@@ -99,7 +97,7 @@ to *new_name*.
 ### sieve activate
 
 **doveadm** [*GLOBAL OPTIONS*] sieve activate
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *scriptname*
 
@@ -109,7 +107,7 @@ for execution at delivery.
 ### sieve deactivate
 
 **doveadm** [*GLOBAL OPTIONS*] sieve deactivate
-  [**-A** | **-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   *scriptname*
 
diff --git a/docs/core/man/include/doveadm-backup-sync.inc b/docs/core/man/include/doveadm-backup-sync.inc
index 4f7acc6ce..b94eeb5a6 100644
--- a/docs/core/man/include/doveadm-backup-sync.inc
+++ b/docs/core/man/include/doveadm-backup-sync.inc
@@ -1,7 +1,7 @@
 ## SYNOPSIS
 
 **doveadm** [*GLOBAL OPTIONS*] **sync**
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-1fPR**]
   [**-l** *secs*]
@@ -21,7 +21,7 @@
   *destination*
 
 **doveadm** [*GLOBAL OPTIONS*] **backup**
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [**-fPR**]
   [**-l** *secs*]
@@ -136,15 +136,10 @@ dsync can be run completely standalone. It doesn't require any Dovecot
 server processes to be running, except when using -u parameter to do a
 *userdb* lookup from auth process.
 
-dsync can sync either one or multiple users using the -u or -A
-parameters.
-
 <!-- @include: ./global-options.inc -->
 
 ## OPTIONS
 
-<!-- @include: ./option-A.inc -->
-
 <!-- @include: ./option-F-file.inc -->
 
 **-1**
diff --git a/docs/core/man/include/doveadm-copy-move.inc b/docs/core/man/include/doveadm-copy-move.inc
index f13492dbf..59c1b21c0 100644
--- a/docs/core/man/include/doveadm-copy-move.inc
+++ b/docs/core/man/include/doveadm-copy-move.inc
@@ -1,11 +1,5 @@
 ## SYNOPSIS
 
-**doveadm** [*GLOBAL OPTIONS*] **move**
-  [**-S** *socket_path*]
-  **-A** **destination**
-  [**user** *source_user*]
-  *search_query*
-
 **doveadm** [*GLOBAL OPTIONS*] **move**
   [**-S** *socket_path*]
   **-F** *file* **destination**
@@ -25,12 +19,6 @@
   *search_query*
 
 
-**doveadm** [*GLOBAL OPTIONS*] **copy**
-  [**-S** *socket_path*]
-  **-A** **destination**
-  [**user** *source_user*]
-  *search_query*
-
 **doveadm** [*GLOBAL OPTIONS*] **copy**
   [**-S** *socket_path*]
   **-F** *file* **destination**
@@ -74,8 +62,6 @@ given *user*(s).
 
 ## OPTIONS
 
-<!-- @include: ./option-A.inc -->
-
 <!-- @include: ./option-F-file.inc -->
 
 <!-- @include: ./option-no-userdb-lookup.inc -->
diff --git a/docs/core/man/include/doveadm-dict.inc b/docs/core/man/include/doveadm-dict.inc
index 155d017bf..0e94b900c 100644
--- a/docs/core/man/include/doveadm-dict.inc
+++ b/docs/core/man/include/doveadm-dict.inc
@@ -36,8 +36,6 @@ Otherwise the commands behave identically.
 
 **doveadm mail dict** command-specific *options*:
 
-<!-- @include: ./option-A.inc -->
-
 <!-- @include: ./option-F-file.inc -->
 
 <!-- @include: ./option-S-socket.inc -->
@@ -52,7 +50,7 @@ Otherwise the commands behave identically.
   *config-filter-name* *key*
 
 **doveadm** [*GLOBAL OPTIONS*] mail dict get
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   *config-filter-name* *key*
 
@@ -69,7 +67,7 @@ Fetch a key from a dictionary.
   *config-filter-name* *prefix*
 
 **doveadm** [*GLOBAL OPTIONS*] mail dict iter
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   [**-1RV**]
   *config-filter-name* *prefix*
@@ -98,7 +96,7 @@ List keys into the dictionary.
   *config-filter-name* *key* *diff*
 
 **doveadm** [*GLOBAL OPTIONS*] mail dict inc
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   [**-t** *timestamp-msecs*]
   *config-filter-name* *key* *diff*
@@ -123,7 +121,7 @@ Increment the value of a numeric key in the keys into the dictionary.
   *config-filter-name* *key* *value*
 
 **doveadm** [*GLOBAL OPTIONS*] mail dict set
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   [**-t** *timestamp-msecs*]
   [**-e** *expire-secs*]
@@ -151,7 +149,7 @@ Set/create keys into the dictionary.
   *config-filter-name* *key*
 
 **doveadm** [*GLOBAL OPTIONS*] mail dict unset
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   [**-t** *timestamp-msecs*]
   *config-filter-name* *key*
diff --git a/docs/core/man/include/doveadm-fs.inc b/docs/core/man/include/doveadm-fs.inc
index 813314ac5..9dbb22231 100644
--- a/docs/core/man/include/doveadm-fs.inc
+++ b/docs/core/man/include/doveadm-fs.inc
@@ -24,8 +24,6 @@ storage driver is designed.
 
 ## OPTIONS
 
-<!-- @include: ./option-A.inc -->
-
 <!-- @include: ./option-u-user.inc -->
 
 <!-- @include: ./option-F-file.inc -->
@@ -40,7 +38,7 @@ storage driver is designed.
   *config-filter-name* *source-path* *dest-path*
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs copy
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   *config-filter-name* *source-path* *dest-path*
 
@@ -54,7 +52,7 @@ Copy source path to the destination path.
   *config-filter-name* *path* [*path* ...]
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs delete
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   [**-R**]
   [**-n** *count*]
@@ -73,7 +71,7 @@ Delete all data associated with the path provided.
 **doveadm** [*GLOBAL OPTIONS*] fs get *config-filter-name* *path*
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs get
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   *config-filter-name* *path*
 
@@ -84,7 +82,7 @@ Retrieve data associated with the path provided.
 **doveadm** [*GLOBAL OPTIONS*] fs iter *config-filter-name* *path*
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs iter
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   *config-filter-name* *path*
 
@@ -95,7 +93,7 @@ Iterate through all data files in the path provided.
 **doveadm** [*GLOBAL OPTIONS*] fs iter-dirs *config-filter-name* *path*
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs iter-dirs
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   *config-filter-name* *path*
 
@@ -109,7 +107,7 @@ Iterate through all directories in the path provided.
   *config-filter-name* *input_path* *path*
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs put
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   [**-h** *hash*]
   [**-m** *key*=*value*]
@@ -130,7 +128,7 @@ Store data at the path provided.
 **doveadm** [*GLOBAL OPTIONS*] fs stat *config-filter-name* *path*
 
 **doveadm** [*GLOBAL OPTIONS*] mail fs stat
-  [**-A** | **-u** *user* | **-F** *file*]
+  [**-u** *user* | **-F** *file*]
   [**-S** *socket_path*]
   *config-filter-name* *path*
 
diff --git a/docs/core/man/include/doveadm-fts-includes.inc b/docs/core/man/include/doveadm-fts-includes.inc
index 80f951be9..2c1d46b14 100644
--- a/docs/core/man/include/doveadm-fts-includes.inc
+++ b/docs/core/man/include/doveadm-fts-includes.inc
@@ -1,7 +1,7 @@
 ### fts flatcurve check
 
 **doveadm** [*GLOBAL OPTIONS*] fts flatcurve check
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [*mailbox* ...]
 
@@ -24,7 +24,7 @@ For each mailbox that has FTS data, it outputs the following key/value fields:
 ### fts flatcurve remove
 
 **doveadm** [*GLOBAL OPTIONS*] fts flatcurve remove
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [*mailbox* ...]
 
@@ -43,7 +43,7 @@ For each mailbox removed, it outputs the following key/value fields:
 ### fts flatcurve rotate
 
 **doveadm** [*GLOBAL OPTIONS*] fts flatcurve rotate
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [*mailbox* ...]
 
@@ -62,7 +62,7 @@ For each mailbox rotated, it outputs the following key/value fields:
 ### fts flatcurve stats
 
 **doveadm** [*GLOBAL OPTIONS*] fts flatcurve stats
-  [**-u** *user* | **-A** | **-F** *file* | **\-\-no-userdb-lookup**]
+  [**-u** *user* | **-F** *file* | **\-\-no-userdb-lookup**]
   [**-S** *socket_path*]
   [*mailbox* ...]
 
diff --git a/docs/core/man/include/option-A.inc b/docs/core/man/include/option-A.inc
deleted file mode 100644
index c1e591791..000000000
--- a/docs/core/man/include/option-A.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-**-A**
-:   If the **-A** option is present, the *command* will be performed for
-    all users. Using this option in combination with system users from
-    **userdb { driver = passwd }** is not recommended, because it
-    contains also users with a lower UID than the one configured with the
-    `first_valid_uid` setting.
-
-	When the SQL userdb module is used, make sure that the
-	[[setting,userdb_sql_iterate_query]] setting matches your database layout.
-
-	When using the LDAP userdb module, make sure that the [[setting,userdb_fields]]
-	and [[setting,userdb_ldap_iterate_fields]] settings match your LDAP schema.
-	Otherwise [[man,doveadm]] will be unable to iterate over all users.
diff --git a/docs/core/man/include/option-F-file.inc b/docs/core/man/include/option-F-file.inc
index 3df42c2c6..c551cce76 100644
--- a/docs/core/man/include/option-F-file.inc
+++ b/docs/core/man/include/option-F-file.inc
@@ -1,6 +1,6 @@
 **-F** *file*
 :   Execute the *command* for all the users in the *file*. This is
-    similar to the **-A** option, but instead of getting the list of
+    similar to the **-u "*"** option, but instead of getting the list of
     users from the userdb, they are read from the given *file*. The
     *file* contains one username per line.
 
diff --git a/docs/installation/upgrade/include/2.4-doveadm.inc b/docs/installation/upgrade/include/2.4-doveadm.inc
index 743deb2de..3b5a74e09 100644
--- a/docs/installation/upgrade/include/2.4-doveadm.inc
+++ b/docs/installation/upgrade/include/2.4-doveadm.inc
@@ -23,6 +23,6 @@ The `dsync` command symlink was removed. Use [[doveadm,sync]] or
 
 `USER` environment variable can be used only with `--no-userdb-lookup` parameter.
 
-All mail commands require providing `-u`, `-F`, `-A` parameter or `--no-userdb-lookup` parameter.
+All mail commands require providing `-u` or `-F` parameter, or `--no-userdb-lookup` parameter.
 This will always be subject to user database lookup and requires access to
 auth userdb socket, unless `--no-userdb-lookup` was used.
diff --git a/lib/data/doveadm.data.js b/lib/data/doveadm.data.js
index 63fd222af..7d0d2d85c 100644
--- a/lib/data/doveadm.data.js
+++ b/lib/data/doveadm.data.js
@@ -5,12 +5,6 @@ import camelCase from 'camelcase'
 import slugify from '@sindresorhus/slugify'
 
 const doveadm_userargs = {
-	'all-users': {
-		cli: 'A',
-		example: false,
-		type: doveadm_arg_types.BOOL,
-		text: `Apply operation to all users.`
-	},
 	'socket-path': {
 		cli: 'S',
 		example: '/var/run/dovecot/doveadm-server',
diff --git a/lib/doveadm.js b/lib/doveadm.js
index fadac3b96..3aa82d450 100644
--- a/lib/doveadm.js
+++ b/lib/doveadm.js
@@ -27,7 +27,7 @@ export const doveadm_args_usermask = {
 	example: 'username',
 	positional: true,
 	type: doveadm_arg_types.STRING,
-	text: `User Mask.`
+	text: `User Mask. Supports wildcards (\`?\` and \`*\`).`
 }
 
 export const doveadm_args_human_timestamp = `