diff --git a/public/globals.js b/public/globals.js
index d3113ed52..77d1cfe0a 100644
--- a/public/globals.js
+++ b/public/globals.js
@@ -1113,9 +1113,10 @@ window.pkp = {
 		'taskTemplates.edit': 'Edit Task and Discussion Template',
 		'taskTemplates.templateAutoAdd':
 			'Automatically add this task and discussion when a submission reaches a specific stage',
+		'taskTemplates.templateAutoAddAtStage': 'Auto-add at stage',
 		'taskTemplates.templateAutoAddInStage':
 			'Automatically add this task and/or discussion when a submission reaches the stage',
-		'taskTemplates.templateName': 'Task and discussion template name',
+		'taskTemplates.templateName': 'Template name',
 		'taskTemplates.title': 'Tasks and Discussions Templates',
 		'user.affiliation': 'Affiliation',
 		'user.affiliations': 'Affiliations',
diff --git a/src/managers/TaskTemplateManager/useTaskTemplateManagerConfig.js b/src/managers/TaskTemplateManager/useTaskTemplateManagerConfig.js
index 10acaf152..770c6e560 100644
--- a/src/managers/TaskTemplateManager/useTaskTemplateManagerConfig.js
+++ b/src/managers/TaskTemplateManager/useTaskTemplateManagerConfig.js
@@ -33,7 +33,7 @@ export function useTaskTemplateManagerConfig() {
 		});
 
 		columns.push({
-			header: t('taskTemplates.templateAutoAdd'),
+			header: t('taskTemplates.templateAutoAddAtStage'),
 			component: 'TaskTemplateManagerCellAutoAdd',
 		});
 
diff --git a/src/managers/TaskTemplateManager/useTaskTemplateManagerForm.js b/src/managers/TaskTemplateManager/useTaskTemplateManagerForm.js
index f858add69..118fb89f3 100644
--- a/src/managers/TaskTemplateManager/useTaskTemplateManagerForm.js
+++ b/src/managers/TaskTemplateManager/useTaskTemplateManagerForm.js
@@ -5,11 +5,8 @@ import {useFetch} from '@/composables/useFetch';
 import {useFetchPaginated} from '@/composables/useFetchPaginated';
 import {useFormChanged} from '@/composables/useFormChanged';
 import {useLocalize} from '@/composables/useLocalize';
-import {useModal} from '@/composables/useModal';
 import {useTaskTemplateManagerEmails} from './useTaskTemplateManagerEmails';
 
-import FileAttacherModal from '@/components/Composer/FileAttacherModal.vue';
-
 export function useTaskTemplateManagerForm({
 	taskTemplate = null,
 	stage = null,
@@ -163,26 +160,6 @@ export function useTaskTemplateManagerForm({
 		];
 	}
 
-	function initDiscussionText() {
-		return {
-			setup: (editor) => {
-				editor.ui.registry.addButton('pkpAttachFiles', {
-					icon: 'upload',
-					text: t('common.attachFiles'),
-					onAction() {
-						const {openSideModal} = useModal();
-
-						openSideModal(FileAttacherModal, {
-							title: t('common.attachFiles'),
-							attachers: [],
-							onAddAttachments: [],
-						});
-					},
-				});
-			},
-		};
-	}
-
 	const preparedContent = computed(() => {
 		const dataDescriptions = emailTemplatesData.value?.dataDescriptions;
 		if (!dataDescriptions) {
@@ -269,10 +246,9 @@ export function useTaskTemplateManagerForm({
 
 	addFieldPreparedContent('description', {
 		groupId: 'discussion',
-		toolbar: 'bold italic underline bullist | pkpAttachFiles | pkpInsert',
+		toolbar: 'bold italic underline bullist | pkpInsert',
 		plugins: ['lists'],
 		size: 'large',
-		init: initDiscussionText(),
 		value: taskTemplate?.description || '',
 		insertModalLabel: t('common.insertContent'),
 		insertLabel: t('common.insert'),