diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index fd1d3561..59bc112e 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -69,8 +69,11 @@ public function getForm(): TemplateResponse {
 		$availableProviders = [];
 		foreach ($availableTaskTypes as $taskTypeId => $availableTaskType) {
 			try {
-				$provider = $this->taskProcessingManager->getPreferredProvider($taskTypeId);
-				$availableProviders[$availableTaskType['name']] = $provider->getName();
+				$providerName = $this->taskProcessingManager->getPreferredProvider($taskTypeId)->getName();
+				if (!isset($availableProviders[$providerName])) {
+					$availableProviders[$providerName] = [];
+				}
+				$availableProviders[$providerName][] = $availableTaskType['name'];
 			} catch (Exception $e) {
 				// pass
 			}
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 9eba572b..6cf25c50 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -18,7 +18,7 @@
 					:checked="state.assistant_enabled"
 					@update:checked="onCheckboxChanged($event, 'assistant_enabled')">
 					<div class="checkbox-text">
-						{{ t('assistant', 'Top-right assistant') }}
+						{{ t('assistant', 'Enable Nextcloud Assistant in header') }}
 					</div>
 				</NcCheckboxRadioSwitch>
 				<NcNoteCard v-if="!state.text_processing_available" type="info">
@@ -29,7 +29,7 @@
 					:disabled="!state.free_prompt_task_type_available"
 					@update:checked="onCheckboxChanged($event, 'free_prompt_picker_enabled')">
 					<div class="checkbox-text">
-						{{ t('assistant', 'AI text generation smart picker') }}
+						{{ t('assistant', 'Enable AI text generation in smart picker') }}
 					</div>
 				</NcCheckboxRadioSwitch>
 				<NcNoteCard v-if="!state.free_prompt_task_type_available" type="info">
@@ -48,7 +48,7 @@
 					:disabled="!state.text_to_image_picker_available"
 					@update:checked="onCheckboxChanged($event, 'text_to_image_picker_enabled')">
 					<div class="checkbox-text">
-						{{ t('assistant', 'Text-to-image smart picker') }}
+						{{ t('assistant', 'Enable text-to-image in smart picker') }}
 					</div>
 				</NcCheckboxRadioSwitch>
 				<NcNoteCard v-if="!state.text_to_image_picker_available" type="info">
@@ -67,7 +67,7 @@
 					:disabled="!state.speech_to_text_picker_available"
 					@update:checked="onCheckboxChanged($event, 'speech_to_text_picker_enabled')">
 					<div class="checkbox-text">
-						{{ t('assistant', 'Speech-to-text smart picker') }}
+						{{ t('assistant', 'Enable speech-to-text in smart picker') }}
 					</div>
 				</NcCheckboxRadioSwitch>
 				<NcNoteCard v-if="!state.speech_to_text_picker_available" type="info">
diff --git a/src/components/PersonalSettings.vue b/src/components/PersonalSettings.vue
index f49fc4f6..bc254fd9 100644
--- a/src/components/PersonalSettings.vue
+++ b/src/components/PersonalSettings.vue
@@ -13,28 +13,28 @@
 				:checked="state.assistant_enabled"
 				@update:checked="onCheckboxChanged($event, 'assistant_enabled')">
 				<div class="checkbox-text">
-					{{ t('assistant', 'Top-right assistant') }}
+					{{ t('assistant', 'Enable Nextcloud Assistant in header') }}
 				</div>
 			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch v-if="state.free_prompt_picker_available"
 				:checked="state.free_prompt_picker_enabled"
 				@update:checked="onCheckboxChanged($event, 'free_prompt_picker_enabled')">
 				<div class="checkbox-text">
-					{{ t('assistant', 'AI text generation smart picker') }}
+					{{ t('assistant', 'Enable AI text generation in smart picker') }}
 				</div>
 			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch v-if="state.text_to_image_picker_available"
 				:checked="state.text_to_image_picker_enabled"
 				@update:checked="onCheckboxChanged($event, 'text_to_image_picker_enabled')">
 				<div class="checkbox-text">
-					{{ t('assistant', 'AI image generation smart picker') }}
+					{{ t('assistant', 'Enable AI image generation in smart picker') }}
 				</div>
 			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch v-if="state.speech_to_text_picker_available"
 				:checked="state.speech_to_text_picker_enabled"
 				@update:checked="onCheckboxChanged($event, 'speech_to_text_picker_enabled')">
 				<div class="checkbox-text">
-					{{ t('assistant', 'AI transcription smart picker') }}
+					{{ t('assistant', 'Enable AI transcription in smart picker') }}
 				</div>
 			</NcCheckboxRadioSwitch>
 			<div v-if="noProvidersAvailable" class="settings-hint">
@@ -46,11 +46,12 @@
 			<div v-else>
 				<h3>{{ t('assistant', 'Configured backends') }}</h3>
 				<p>{{ t('assistant', 'The following services are used as backends for Nextcloud Assistant:') }}</p>
-				<ul>
-					<li v-for="(providerName, taskName) in providers" :key="taskName">
-						{{ t('assistant', '{providerName} for {taskName}', { providerName, taskName }, null, { escape: false }) }}
-					</li>
-				</ul>
+				<template v-for="(taskNames, providerName) in providers">
+					<h5 :key="providerName">
+						{{ providerName }}
+					</h5>
+					{{ taskNames.join(', ') }}
+				</template>
 			</div>
 		</div>
 	</div>