diff --git a/admin_manual/ai/app_assistant.rst b/admin_manual/ai/app_assistant.rst
index 5f66636e7f0..6ecf74c8a30 100644
--- a/admin_manual/ai/app_assistant.rst
+++ b/admin_manual/ai/app_assistant.rst
@@ -190,6 +190,33 @@ To enable/disable the text-to-image smart picker for all the users.
 
 To enable/disable the speech-to-text smart picker for all the users.
 
+5. Data folder
+
+.. code-block::
+
+   occ config:app:set assistant default_data_folder --value="Assistant" --type=string
+
+The assistant stores the content it generates, such as generated images and speech-to-text
+output, in a folder in the files of each user. This sets the name that folder is given when
+it is created. It defaults to ``Assistant``, and is also editable in the Assistant admin
+settings.
+
+Users can choose their own name in their personal Assistant settings, which is stored per
+user and takes precedence over the server-wide default:
+
+.. code-block::
+
+   occ user:setting $USER_ID assistant data_folder "Assistant"
+
+Two things to keep in mind:
+
+* Changing either value does not rename or move a folder that already exists. It only
+  affects the name used the next time a folder has to be created, so existing generated
+  content stays where it is.
+* A user who already has a folder under the built-in name ``Assistant``, from before a
+  default was set, keeps using it. This avoids starting a second folder for them and
+  leaving their earlier output behind.
+
 Task processing
 ~~~~~~~~~~~~~~~
 
diff --git a/user_manual/ai_assistant.rst b/user_manual/ai_assistant.rst
index 908bd8c9035..2a4ef88f163 100644
--- a/user_manual/ai_assistant.rst
+++ b/user_manual/ai_assistant.rst
@@ -20,8 +20,23 @@ Personal settings
 -----------------
 
 The assistant personal settings are in **Personal settings** under the **Artificial intelligence**
-section. You can disable the assistant top menu entry there, and enable or disable the
-AI-related smart pickers.
+section. You can disable the assistant top menu entry there, enable or disable the
+AI-related smart pickers, and change the name of the folder the assistant saves its output to.
+
+Where generated content is saved
+--------------------------------
+
+Content the assistant generates for you, such as generated images and speech-to-text output, is
+saved to a folder in your Files. It is called ``Assistant`` unless your administrator has chosen
+a different name for the instance.
+
+You can pick your own name for it under **Data folder** in the assistant personal settings. Leave
+the field empty to keep the name your administrator has set; the placeholder shows what that is.
+
+.. note::
+
+   Changing the name does not rename or move the folder you already have. It applies the next
+   time a folder has to be created, so anything generated before the change stays where it is.
 
 Running a task
 --------------
@@ -628,7 +643,9 @@ applies it in future conversations without you having to repeat yourself.
 Where skills are stored
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Your personal skills live in your Nextcloud Files under the folder ``Assistant/Context Agent/Skills/``.
+Your personal skills live in your Nextcloud Files under ``Context Agent/Skills/`` inside the
+assistant data folder, so with the default folder name that is
+``Assistant/Context Agent/Skills/``.
 
 Each skill is a subfolder containing a file called ``SKILL.md``. The ``SKILL.md`` file starts
 with a YAML frontmatter block that defines the skill's name and description, followed by the