diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9426de44bb..5bb747523d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The following sections list the changes for unreleased.
 * Enhancement - Allow overriding the cookie based route by claim: [#2508](https://github.com/owncloud/ocis/pull/2508)
 * Enhancement - Redirect invalid links to oC Web: [#2493](https://github.com/owncloud/ocis/pull/2493)
 * Enhancement - Add set space quota permission: [#2459](https://github.com/owncloud/ocis/pull/2459)
+* Enhancement - Demo users and groups won't be generated unless requested: [#2495](https://github.com/owncloud/ocis/pull/2495)
 * Enhancement - Create a Space using the Graph API: [#2471](https://github.com/owncloud/ocis/pull/2471)
 * Enhancement - Update go-chi/chi to version 5.0.3: [#2429](https://github.com/owncloud/ocis/pull/2429)
 * Enhancement - Upgrade go micro to v3.6.0: [#2451](https://github.com/owncloud/ocis/pull/2451)
@@ -99,6 +100,15 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/ocis/pull/2459
 
+* Enhancement - Demo users and groups won't be generated unless requested: [#2495](https://github.com/owncloud/ocis/pull/2495)
+
+   We've added a new environment variable to decide whether we should generate the demo users and
+   groups or not. This environment variable is false by default, so the demo users and groups won't
+   be generated by default. There are still some users and groups automatically generated: for
+   users: Reva IOP, Kopano IDP, admin; for groups: sysusers and users.
+
+   https://github.com/owncloud/ocis/pull/2495
+
 * Enhancement - Create a Space using the Graph API: [#2471](https://github.com/owncloud/ocis/pull/2471)
 
    Spaces can now be created on `POST /drives/{drive-name}`. Only users with the `create-space`