diff --git a/dojo/db_migrations/0217_system_settings_disclaimer_notif.py b/dojo/db_migrations/0217_system_settings_disclaimer_notif.py
new file mode 100644
index 0000000000..785142e878
--- /dev/null
+++ b/dojo/db_migrations/0217_system_settings_disclaimer_notif.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.0.8 on 2024-09-12 18:22
+
+from django.db import migrations
+
+
+def copy_notif_field(apps, schema_editor):
+    system_settings_model = apps.get_model('dojo', 'System_Settings')
+    if system_settings_model.disclaimer_notifications:
+        system_settings_model.disclaimer_reports = system_settings_model.disclaimer_notifications
+        system_settings_model.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0216_system_settings_disclaimer_notif'),
+    ]
+
+    operations = [
+        migrations.RunPython(copy_notif_field),
+    ]
diff --git a/dojo/forms.py b/dojo/forms.py
index 031c70a6c9..d6f5513bc7 100644
--- a/dojo/forms.py
+++ b/dojo/forms.py
@@ -2293,7 +2293,7 @@ def __init__(self, *args, **kwargs):
         if get_system_setting("disclaimer_reports_forced"):
             self.fields["include_disclaimer"].disabled = True
             self.fields["include_disclaimer"].initial = "1"  # represents yes
-            self.fields["include_disclaimer"].help_text="Administrator of the system enforced placement of disclaimer in all reports. You are not able exclude disclaimer from this report."
+            self.fields["include_disclaimer"].help_text = "Administrator of the system enforced placement of disclaimer in all reports. You are not able exclude disclaimer from this report."
 
 
 class CustomReportOptionsForm(forms.Form):
diff --git a/dojo/templates/dojo/edit_note.html b/dojo/templates/dojo/edit_note.html
index b85a1fa070..9688855d8c 100644
--- a/dojo/templates/dojo/edit_note.html
+++ b/dojo/templates/dojo/edit_note.html
@@ -3,6 +3,12 @@
 {% block content %}
     {{ block.super }}
     <h3>{% trans "Edit Note" %}</h3><br />
+    {% if system_settings.disclaimer_notes %}
+        <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; margin: 1em">
+            <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">Disclaimer</span><br/>
+            <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notes }}</p>
+        </div>
+    {% endif %}
     <form class="form-horizontal" action="{% url 'edit_note' note.id page objid %}" method="post">{% csrf_token %}
         {% include "dojo/form_fields.html" with form=form %}
         <div class="form-group">