diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/create_form.html b/webapp/WEB-INF/templates/admin/plugins/forms/create_form.html
index 2cf3ef6d6..d0598a98d 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/create_form.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/create_form.html
@@ -18,18 +18,22 @@
 	// Initial toggle based on checkbox state
 	const endMessage = document.getElementById('endMessage');
 	const endMessageDisplay = document.getElementById('endMessageDisplay');
-	
+	const labelEndMessageButton = document.getElementById('labelEndMessageButton');
+
 	// Hide initially
 	endMessage.classList.toggle('d-none', true);
-	
+	labelEndMessageButton.classList.toggle('d-none', true);
+
 	// Show if checkbox is checked
 	if (endMessageDisplay && endMessageDisplay.checked) {
 		endMessage.classList.toggle('d-none', false);
+		labelEndMessageButton.classList.toggle('d-none', false);
 	}
-	
+
 	// Toggle on change
 	document.getElementById('labelEndMessage').addEventListener('change', function() {
 		endMessage.classList.toggle('d-none');
+		labelEndMessageButton.classList.toggle('d-none');
 	});
 });
 </script>
\ No newline at end of file
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/forms_commons.html b/webapp/WEB-INF/templates/admin/plugins/forms/forms_commons.html
index 3fe0c2ddd..2e6db592f 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/forms_commons.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/forms_commons.html
@@ -527,6 +527,9 @@ <h5 id="offcanvasFormLabel${id}">${label!}</h5>
 			<@formGroup labelKey='#i18n{forms.create_form.labelEndMessage}' id='endMessage' helpKey='#i18n{forms.create_form.labelEndMessage.help}' rows=2>
 				<@input type='textarea' name='endMessage' richtext=true>${formMessage.endMessage!}</@input>
 			</@formGroup>
+			<@formGroup labelKey='#i18n{forms.create_form.labelLabelEndMessageButton}' id='labelEndMessageButton' rows=2>
+				<@input type='text' name='labelEndMessageButton' value='${formMessage.labelEndMessageButton!}' />
+			</@formGroup>
 		</@fieldSet>
 		<!-- workgroup -->
 		<@fieldSet legend='#i18n{forms.modify_form.workgroup.label}'>
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/modify_form.html b/webapp/WEB-INF/templates/admin/plugins/forms/modify_form.html
index eccb6d12c..1d5869bb9 100644
--- a/webapp/WEB-INF/templates/admin/plugins/forms/modify_form.html
+++ b/webapp/WEB-INF/templates/admin/plugins/forms/modify_form.html
@@ -35,23 +35,26 @@
 <@toastr infos=infos warnings=warnings errors=errors />
 <@formModal />
 <script>
-document.addEventListener('DOMContentLoaded', function () {
+document.addEventListener('DOMContentLoaded', function() {
+	// Initial toggle based on checkbox state
 	const endMessage = document.getElementById('endMessage');
 	const endMessageDisplay = document.getElementById('endMessageDisplay');
-	const labelEndMessage = document.getElementById('labelEndMessage');
+	const labelEndMessageButton = document.getElementById('labelEndMessageButton');
 
-	if (endMessageDisplay && endMessage) {
-		endMessage.style.display = endMessageDisplay.checked ? 'block' : 'none';
+	// Hide initially
+	endMessage.classList.toggle('d-none', true);
+	labelEndMessageButton.classList.toggle('d-none', true);
 
-		endMessageDisplay.addEventListener('change', function () {
-			endMessage.style.display = this.checked ? 'block' : 'none';
-		});
+	// Show if checkbox is checked
+	if (endMessageDisplay && endMessageDisplay.checked) {
+		endMessage.classList.toggle('d-none', false);
+		labelEndMessageButton.classList.toggle('d-none', false);
 	}
 
-	if (labelEndMessage && endMessage) {
-		labelEndMessage.addEventListener('change', function () {
-			endMessage.style.display = endMessage.style.display === 'none' ? 'block' : 'none';
-		});
-	}
+	// Toggle on change
+	document.getElementById('labelEndMessage').addEventListener('change', function() {
+		endMessage.classList.toggle('d-none');
+		labelEndMessageButton.classList.toggle('d-none');
+	});
 });
 </script>
\ No newline at end of file