diff --git a/docs/content/en/open_source/upgrading/2.43.md b/docs/content/en/open_source/upgrading/2.43.md
index faa443cfea2..596b2a0080d 100644
--- a/docs/content/en/open_source/upgrading/2.43.md
+++ b/docs/content/en/open_source/upgrading/2.43.md
@@ -2,6 +2,9 @@
 title: 'Upgrading to DefectDojo Version 2.43.x'
 toc_hide: true
 weight: -20250106
-description: No special instructions.
+description: Disclaimer field renamed/split.
 ---
-There are no special instructions for upgrading to 2.43.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.43.0) for the contents of the release.
+
+[Pull request #10902](https://github.com/DefectDojo/django-DefectDojo/pull/10902) introduced different kinds of disclaimers within the DefectDojo instance. The original content of the disclaimer was copied to all new fields where it had been used until now (so this change does not require any action on the user's side). However, if users were managing the original disclaimer via API (endpoint `/api/v2/system_settings/1/`, field `disclaimer`), be aware that the fields are now called `disclaimer_notifications` and `disclaimer_reports` (plus there is one additional, previously unused field called `disclaimer_notes`).
+
+But there are no other special instructions for upgrading to 2.43.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.43.0) for the contents of the release.
diff --git a/dojo/db_migrations/0220_system_settings_disclaimer_notif.py b/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
new file mode 100644
index 00000000000..77a9d836c7b
--- /dev/null
+++ b/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.0.8 on 2024-09-12 18:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0219_system_settings_enforce_verified_status_jira_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='system_settings',
+            old_name='disclaimer',
+            new_name='disclaimer_notifications',
+        ),
+        migrations.AlterField(
+            model_name='system_settings',
+            name='disclaimer_notifications',
+            field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer on all notifications', max_length=3000, verbose_name='Custom Disclaimer for Notifications'),
+        ),
+        migrations.AddField(
+            model_name='system_settings',
+            name='disclaimer_reports',
+            field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer on generated reports', max_length=5000, verbose_name='Custom Disclaimer for Reports'),
+        ),
+        migrations.AddField(
+            model_name='system_settings',
+            name='disclaimer_notes',
+            field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer next to input form for notes', max_length=3000, verbose_name='Custom Disclaimer for Notes'),
+        ),
+        migrations.AddField(
+            model_name='system_settings',
+            name='disclaimer_reports_forced',
+            field=models.BooleanField(default=False, help_text="Disclaimer will be added to all reports even if user didn't selected 'Include disclaimer'.", verbose_name='Force to add disclaimer reports'),
+        ),
+    ]
diff --git a/dojo/db_migrations/0221_system_settings_disclaimer_notif.py b/dojo/db_migrations/0221_system_settings_disclaimer_notif.py
new file mode 100644
index 00000000000..8a979350640
--- /dev/null
+++ b/dojo/db_migrations/0221_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').objects.get()
+    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', '0220_system_settings_disclaimer_notif'),
+    ]
+
+    operations = [
+        migrations.RunPython(copy_notif_field, reverse_code=migrations.RunPython.noop),
+    ]
diff --git a/dojo/fixtures/defect_dojo_sample_data.json b/dojo/fixtures/defect_dojo_sample_data.json
index 2d0ece6cb16..a0c5414058c 100644
--- a/dojo/fixtures/defect_dojo_sample_data.json
+++ b/dojo/fixtures/defect_dojo_sample_data.json
@@ -7119,7 +7119,7 @@
         "enable_finding_sla": true,
         "allow_anonymous_survey_repsonse": false,
         "credentials": "",
-        "disclaimer": "",
+        "disclaimer_notifications": "",
         "risk_acceptance_form_default_days": 180,
         "risk_acceptance_notify_before_expiration": 10,
         "enable_credentials": true,
diff --git a/dojo/forms.py b/dojo/forms.py
index 04ed0d424d7..f9a52f9530f 100644
--- a/dojo/forms.py
+++ b/dojo/forms.py
@@ -860,6 +860,8 @@ def __init__(self, *args, **kwargs):
             self.fields["expiration_date"].initial = expiration_date
         # self.fields['path'].help_text = 'Existing proof uploaded: %s' % self.instance.filename() if self.instance.filename() else 'None'
         self.fields["accepted_findings"].queryset = get_authorized_findings(Permissions.Risk_Acceptance)
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
 
 
 class BaseManageFileFormSet(forms.BaseModelFormSet):
@@ -1569,6 +1571,8 @@ def __init__(self, *args, **kwargs):
         self.fields["severity"].required = False
         # we need to defer initialization to prevent multiple initializations if other forms are shown
         self.fields["tags"].widget.tag_options = tagulous.models.options.TagOptions(autocomplete_settings={"width": "200px", "defer": True})
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
 
     def clean(self):
         cleaned_data = super().clean()
@@ -1712,6 +1716,11 @@ class Meta:
         model = Notes
         fields = ["entry", "private"]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
+
 
 class TypedNoteForm(NoteForm):
 
@@ -1763,6 +1772,8 @@ def __init__(self, *args, **kwargs):
             self.fields["mitigated_by"].queryset = get_authorized_users(Permissions.Test_Edit)
             self.fields["mitigated"].initial = self.instance.mitigated
             self.fields["mitigated_by"].initial = self.instance.mitigated_by
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
 
     def _post_clean(self):
         super()._post_clean()
@@ -1815,6 +1826,11 @@ class Meta:
         model = Notes
         fields = ["entry"]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
+
 
 class ClearFindingReviewForm(forms.ModelForm):
     entry = forms.CharField(
@@ -1829,6 +1845,11 @@ class Meta:
         model = Finding
         fields = ["active", "verified", "false_p", "out_of_scope", "duplicate", "is_mitigated"]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
+
 
 class ReviewFindingForm(forms.Form):
     reviewers = forms.MultipleChoiceField(
@@ -1866,6 +1887,8 @@ def __init__(self, *args, **kwargs):
         self.reviewer_queryset = users
         # Set the users in the form
         self.fields["reviewers"].choices = self._get_choices(self.reviewer_queryset)
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
 
     @staticmethod
     def _get_choices(queryset):
@@ -2303,6 +2326,13 @@ class ReportOptionsForm(forms.Form):
     include_disclaimer = forms.ChoiceField(choices=yes_no, label="Disclaimer")
     report_type = forms.ChoiceField(choices=(("HTML", "HTML"),))
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*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."
+
 
 class CustomReportOptionsForm(forms.Form):
     yes_no = (("0", "No"), ("1", "Yes"))
@@ -2738,6 +2768,11 @@ class Meta:
         model = Engagement_Presets
         exclude = ["product"]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if disclaimer := get_system_setting("disclaimer_notes"):
+            self.disclaimer = disclaimer.strip()
+
 
 class DeleteEngagementPresetsForm(forms.ModelForm):
     id = forms.IntegerField(required=True,
diff --git a/dojo/models.py b/dojo/models.py
index ff34cde034a..6d2d4037b8a 100644
--- a/dojo/models.py
+++ b/dojo/models.py
@@ -513,9 +513,20 @@ class System_Settings(models.Model):
         help_text=_("Enable anyone with a link to the survey to answer a survey"),
     )
     credentials = models.TextField(max_length=3000, blank=True)
-    disclaimer = models.TextField(max_length=3000, default="", blank=True,
-                                  verbose_name=_("Custom Disclaimer"),
-                                  help_text=_("Include this custom disclaimer on all notifications and generated reports"))
+    disclaimer_notifications = models.TextField(max_length=3000, default="", blank=True,
+                                  verbose_name=_("Custom Disclaimer for Notifications"),
+                                  help_text=_("Include this custom disclaimer on all notifications"))
+    disclaimer_reports = models.TextField(max_length=5000, default="", blank=True,
+                                  verbose_name=_("Custom Disclaimer for Reports"),
+                                  help_text=_("Include this custom disclaimer on generated reports"))
+    disclaimer_reports_forced = models.BooleanField(
+        default=False,
+        blank=False,
+        verbose_name=_("Force to add disclaimer reports"),
+        help_text=_("Disclaimer will be added to all reports even if user didn't selected 'Include disclaimer'."))
+    disclaimer_notes = models.TextField(max_length=3000, default="", blank=True,
+                                  verbose_name=_("Custom Disclaimer for Notes"),
+                                  help_text=_("Include this custom disclaimer next to input form for notes"))
     risk_acceptance_form_default_days = models.IntegerField(null=True, blank=True, default=180, help_text=_("Default expiry period for risk acceptance form."))
     risk_acceptance_notify_before_expiration = models.IntegerField(null=True, blank=True, default=10,
                     verbose_name=_("Risk acceptance expiration heads up days"), help_text=_("Notify X days before risk acceptance expires. Leave empty to disable."))
diff --git a/dojo/reports/views.py b/dojo/reports/views.py
index 4bcd7386769..c57931df109 100644
--- a/dojo/reports/views.py
+++ b/dojo/reports/views.py
@@ -132,6 +132,10 @@ def _set_state(self, request: HttpRequest):
         self.host = report_url_resolver(request)
         self.selected_widgets = self.get_selected_widgets(request)
         self.widgets = list(self.selected_widgets.values())
+        self.include_disclaimer = get_system_setting("disclaimer_reports_forced", 0)
+        self.disclaimer = get_system_setting("disclaimer_reports")
+        if self.include_disclaimer and len(self.disclaimer) == 0:
+            self.disclaimer = "Please configure in System Settings."
 
     def get_selected_widgets(self, request):
         selected_widgets = report_widget_factory(json_data=request.POST["json"], request=request, host=self.host,
@@ -164,7 +168,10 @@ def get_context(self):
             "host": self.host,
             "finding_notes": self.finding_notes,
             "finding_images": self.finding_images,
-            "user_id": self.request.user.id}
+            "user_id": self.request.user.id,
+            "include_disclaimer": self.include_disclaimer,
+            "disclaimer": self.disclaimer,
+        }
 
 
 def report_findings(request):
@@ -285,8 +292,8 @@ def product_endpoint_report(request, pid):
     include_finding_images = int(request.GET.get("include_finding_images", 0))
     include_executive_summary = int(request.GET.get("include_executive_summary", 0))
     include_table_of_contents = int(request.GET.get("include_table_of_contents", 0))
-    include_disclaimer = int(request.GET.get("include_disclaimer", 0))
-    disclaimer = get_system_setting("disclaimer")
+    include_disclaimer = int(request.GET.get("include_disclaimer", 0)) or (get_system_setting("disclaimer_reports_forced", 0))
+    disclaimer = get_system_setting("disclaimer_reports")
     if include_disclaimer and len(disclaimer) == 0:
         disclaimer = "Please configure in System Settings."
     generate = "_generate" in request.GET
@@ -363,8 +370,8 @@ def generate_report(request, obj, host_view=False):
     include_finding_images = int(request.GET.get("include_finding_images", 0))
     include_executive_summary = int(request.GET.get("include_executive_summary", 0))
     include_table_of_contents = int(request.GET.get("include_table_of_contents", 0))
-    include_disclaimer = int(request.GET.get("include_disclaimer", 0))
-    disclaimer = get_system_setting("disclaimer")
+    include_disclaimer = int(request.GET.get("include_disclaimer", 0)) or (get_system_setting("disclaimer_reports_forced", 0))
+    disclaimer = get_system_setting("disclaimer_reports")
 
     if include_disclaimer and len(disclaimer) == 0:
         disclaimer = "Please configure in System Settings."
diff --git a/dojo/templates/dojo/custom_html_report.html b/dojo/templates/dojo/custom_html_report.html
index de89837f747..db7b4e3c070 100644
--- a/dojo/templates/dojo/custom_html_report.html
+++ b/dojo/templates/dojo/custom_html_report.html
@@ -3,6 +3,12 @@
 {% block content %}
     {{ block.super }}
     <div class="container" id="html_report">
+        {% if include_disclaimer %}
+            <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
+                <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;">{{ disclaimer | safe }}</p>
+            </div>
+		{% endif %}
         {% for widget in widgets %}
             {{ widget.get_html }}
         {% endfor %}
diff --git a/dojo/templates/dojo/endpoint_pdf_report.html b/dojo/templates/dojo/endpoint_pdf_report.html
index b214afadb35..10cf2804c97 100644
--- a/dojo/templates/dojo/endpoint_pdf_report.html
+++ b/dojo/templates/dojo/endpoint_pdf_report.html
@@ -81,7 +81,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/engagement_pdf_report.html b/dojo/templates/dojo/engagement_pdf_report.html
index a9c8ac8101c..ff341274354 100644
--- a/dojo/templates/dojo/engagement_pdf_report.html
+++ b/dojo/templates/dojo/engagement_pdf_report.html
@@ -158,7 +158,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/finding_pdf_report.html b/dojo/templates/dojo/finding_pdf_report.html
index 6d376c15bcb..ea051d43d0e 100644
--- a/dojo/templates/dojo/finding_pdf_report.html
+++ b/dojo/templates/dojo/finding_pdf_report.html
@@ -57,7 +57,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/findings_list_snippet.html b/dojo/templates/dojo/findings_list_snippet.html
index 51e85ab8d1b..c83ba1f22fa 100644
--- a/dojo/templates/dojo/findings_list_snippet.html
+++ b/dojo/templates/dojo/findings_list_snippet.html
@@ -253,6 +253,12 @@ <h3 class="has-filters">
                                             {{ bulk_edit_form.media.js }}
                                         {% endcomment %}
                                         {{ bulk_edit_form.tags }}
+                                        {% if bulk_edit_form.disclaimer %}
+                                            <div style="background-color:#DADCE2; border:1px #003333; padding:.3em; margin:.1em; ">
+                                                <div style="color:#ff0000;">Disclaimer</div>
+                                                <div>{{ bulk_edit_form.disclaimer }}</div>
+                                            </div>
+                                        {% endif %}
                                         <input type="submit" class="btn btn-sm btn-primary" value="Submit"/>
                                     </form>
                             </li>
diff --git a/dojo/templates/dojo/form_fields.html b/dojo/templates/dojo/form_fields.html
index 98706ee46d3..6af19a96aa9 100644
--- a/dojo/templates/dojo/form_fields.html
+++ b/dojo/templates/dojo/form_fields.html
@@ -80,4 +80,11 @@
             </div>
         {% endif %}
     </div>
-{% endfor %}
\ No newline at end of file
+{% endfor %}
+
+{% if form.disclaimer %}
+    <div class="form-group" style="background-color:#DADCE2; border:1px #003333; padding:.8em; margin:.8em; ">
+        <div class="col-sm-2" style="color:#ff0000;">Disclaimer</div>
+        <div class="col-sm-10">{{ form.disclaimer }}</div>
+    </div>
+{% endif %}
diff --git a/dojo/templates/dojo/product_endpoint_pdf_report.html b/dojo/templates/dojo/product_endpoint_pdf_report.html
index 614fa0f00f4..0a1cb6e5237 100644
--- a/dojo/templates/dojo/product_endpoint_pdf_report.html
+++ b/dojo/templates/dojo/product_endpoint_pdf_report.html
@@ -119,7 +119,7 @@ <h5>Finding Age</h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
         {% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/product_pdf_report.html b/dojo/templates/dojo/product_pdf_report.html
index b02b2609de6..25480502757 100644
--- a/dojo/templates/dojo/product_pdf_report.html
+++ b/dojo/templates/dojo/product_pdf_report.html
@@ -142,7 +142,7 @@ <h5>Finding Age</h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/product_type_pdf_report.html b/dojo/templates/dojo/product_type_pdf_report.html
index 4b0fc48d9fc..ec550d1524b 100644
--- a/dojo/templates/dojo/product_type_pdf_report.html
+++ b/dojo/templates/dojo/product_type_pdf_report.html
@@ -114,7 +114,7 @@ <h4>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/test_pdf_report.html b/dojo/templates/dojo/test_pdf_report.html
index e9ec79d6aa9..b1d1cd7b5fa 100644
--- a/dojo/templates/dojo/test_pdf_report.html
+++ b/dojo/templates/dojo/test_pdf_report.html
@@ -146,7 +146,7 @@ <h5>
         {% if include_disclaimer%}
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <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;">{{ disclaimer }}</p>
+                <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ disclaimer | safe }}</p>
             </div>
 		{% endif %}
         <div class="row">
diff --git a/dojo/templates/dojo/view_test.html b/dojo/templates/dojo/view_test.html
index a4e0390b91a..e551c4858ea 100644
--- a/dojo/templates/dojo/view_test.html
+++ b/dojo/templates/dojo/view_test.html
@@ -848,6 +848,12 @@ <h4 class="has-filters">
                                 {{ bulk_edit_form.media.css }}
                                 {{ bulk_edit_form.media.js }}
                                 {{ bulk_edit_form.tags }}
+                                {% if bulk_edit_form.disclaimer %}
+                                    <div style="background-color:#DADCE2; border:1px #003333; padding:.3em; margin:.1em; ">
+                                        <div style="color:#ff0000;">Disclaimer</div>
+                                        <div>{{ bulk_edit_form.disclaimer }}</div>
+                                    </div>
+                                {% endif %}
                                 <input type="submit"
                                     class="btn btn-sm btn-secondary"
                                     value="Submit"
diff --git a/dojo/templates/notifications/alert/review_requested.tpl b/dojo/templates/notifications/alert/review_requested.tpl
index 6d4ee62e633..486e1ce6fe3 100644
--- a/dojo/templates/notifications/alert/review_requested.tpl
+++ b/dojo/templates/notifications/alert/review_requested.tpl
@@ -14,7 +14,7 @@
 
 {% trans "Full details of the finding can be reviewed at" %} {{ url|full_url }}
 
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}    
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}    
     {% trans "Disclaimer:" %}
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
\ No newline at end of file
diff --git a/dojo/templates/notifications/mail/engagement_added.tpl b/dojo/templates/notifications/mail/engagement_added.tpl
index 4769979ba18..681adc36ccc 100644
--- a/dojo/templates/notifications/mail/engagement_added.tpl
+++ b/dojo/templates/notifications/mail/engagement_added.tpl
@@ -29,11 +29,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/other.tpl b/dojo/templates/notifications/mail/other.tpl
index 69c96362d2d..65e5d854c3b 100644
--- a/dojo/templates/notifications/mail/other.tpl
+++ b/dojo/templates/notifications/mail/other.tpl
@@ -31,11 +31,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/product_added.tpl b/dojo/templates/notifications/mail/product_added.tpl
index ef8fa7faa6f..9e5ecded414 100644
--- a/dojo/templates/notifications/mail/product_added.tpl
+++ b/dojo/templates/notifications/mail/product_added.tpl
@@ -28,11 +28,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/product_type_added.tpl b/dojo/templates/notifications/mail/product_type_added.tpl
index 72d7972f56a..a229882a346 100644
--- a/dojo/templates/notifications/mail/product_type_added.tpl
+++ b/dojo/templates/notifications/mail/product_type_added.tpl
@@ -28,11 +28,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/report_created.tpl b/dojo/templates/notifications/mail/report_created.tpl
index efbb4b8fd61..0c898d276ec 100644
--- a/dojo/templates/notifications/mail/report_created.tpl
+++ b/dojo/templates/notifications/mail/report_created.tpl
@@ -25,11 +25,11 @@
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
 
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/review_requested.tpl b/dojo/templates/notifications/mail/review_requested.tpl
index 98bde4113ab..c3ef81b1a12 100644
--- a/dojo/templates/notifications/mail/review_requested.tpl
+++ b/dojo/templates/notifications/mail/review_requested.tpl
@@ -33,11 +33,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/risk_acceptance_expiration.tpl b/dojo/templates/notifications/mail/risk_acceptance_expiration.tpl
index 7fc4916d1df..ce76a2d1b5b 100644
--- a/dojo/templates/notifications/mail/risk_acceptance_expiration.tpl
+++ b/dojo/templates/notifications/mail/risk_acceptance_expiration.tpl
@@ -52,11 +52,11 @@
                     {% url 'notifications' as notification_url %}
                     {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
                 </p>
-                {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+                {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                     <br/>
                     <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                         <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                        <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                        <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                     </div>
                 {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/scan_added.tpl b/dojo/templates/notifications/mail/scan_added.tpl
index 513b24818db..263585246e0 100644
--- a/dojo/templates/notifications/mail/scan_added.tpl
+++ b/dojo/templates/notifications/mail/scan_added.tpl
@@ -72,11 +72,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/sla_breach.tpl b/dojo/templates/notifications/mail/sla_breach.tpl
index 692df2ef2e2..97c08762bae 100644
--- a/dojo/templates/notifications/mail/sla_breach.tpl
+++ b/dojo/templates/notifications/mail/sla_breach.tpl
@@ -45,11 +45,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/sla_breach_combined.tpl b/dojo/templates/notifications/mail/sla_breach_combined.tpl
index 5b88a656e27..4fc8c8f801e 100644
--- a/dojo/templates/notifications/mail/sla_breach_combined.tpl
+++ b/dojo/templates/notifications/mail/sla_breach_combined.tpl
@@ -55,7 +55,7 @@
             {% url 'notifications' as notification_url %}
             {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
         </p>
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             <br />
             <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                 <span style="font-size:16pt;
@@ -64,7 +64,7 @@
                 <br />
                 <p style="font-size:11pt;
                           line-height:10pt;
-                          font-family: 'Cambria','times roman',serif">{{ system_settings.disclaimer }}</p>
+                          font-family: 'Cambria','times roman',serif">{{ system_settings.disclaimer_notifications }}</p>
             </div>
         {% endif %}
     {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/test_added.tpl b/dojo/templates/notifications/mail/test_added.tpl
index 285bb28faf7..3c235ea0762 100644
--- a/dojo/templates/notifications/mail/test_added.tpl
+++ b/dojo/templates/notifications/mail/test_added.tpl
@@ -30,11 +30,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/upcoming_engagement.tpl b/dojo/templates/notifications/mail/upcoming_engagement.tpl
index ae6da9da7b2..858314449c0 100644
--- a/dojo/templates/notifications/mail/upcoming_engagement.tpl
+++ b/dojo/templates/notifications/mail/upcoming_engagement.tpl
@@ -28,11 +28,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/mail/user_mentioned.tpl b/dojo/templates/notifications/mail/user_mentioned.tpl
index 651fd9df499..9601da3c9a5 100644
--- a/dojo/templates/notifications/mail/user_mentioned.tpl
+++ b/dojo/templates/notifications/mail/user_mentioned.tpl
@@ -31,11 +31,11 @@
                 {% url 'notifications' as notification_url %}
                 {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
             </p>
-            {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+            {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
                 <br/>
                 <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
                     <span style="font-size:16pt;  font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
-                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer }}</p>
+                    <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
                 </div>
             {% endif %}
         {% endautoescape %}
diff --git a/dojo/templates/notifications/msteams/engagement_added.tpl b/dojo/templates/notifications/msteams/engagement_added.tpl
index 9d7c7ef5b37..747f8911079 100644
--- a/dojo/templates/notifications/msteams/engagement_added.tpl
+++ b/dojo/templates/notifications/msteams/engagement_added.tpl
@@ -21,10 +21,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
         
diff --git a/dojo/templates/notifications/msteams/other.tpl b/dojo/templates/notifications/msteams/other.tpl
index ef0cbe4bd99..123390f9c58 100644
--- a/dojo/templates/notifications/msteams/other.tpl
+++ b/dojo/templates/notifications/msteams/other.tpl
@@ -11,10 +11,10 @@
             "activityImage": "https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/master/dojo/static/dojo/img/chop.png",
             "text": "{% autoescape on %} {{ description }} {% endautoescape %}"
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/product_added.tpl b/dojo/templates/notifications/msteams/product_added.tpl
index 31e5a71bf9a..d2def33cd0f 100644
--- a/dojo/templates/notifications/msteams/product_added.tpl
+++ b/dojo/templates/notifications/msteams/product_added.tpl
@@ -17,10 +17,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/product_type_added.tpl b/dojo/templates/notifications/msteams/product_type_added.tpl
index 926ade5a2c7..b650f23d6c3 100644
--- a/dojo/templates/notifications/msteams/product_type_added.tpl
+++ b/dojo/templates/notifications/msteams/product_type_added.tpl
@@ -17,10 +17,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/report_created.tpl b/dojo/templates/notifications/msteams/report_created.tpl
index 8a9b246ebf3..42f8398ed25 100644
--- a/dojo/templates/notifications/msteams/report_created.tpl
+++ b/dojo/templates/notifications/msteams/report_created.tpl
@@ -17,10 +17,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/review_requested.tpl b/dojo/templates/notifications/msteams/review_requested.tpl
index d1a38c49b0c..1ec637c900d 100644
--- a/dojo/templates/notifications/msteams/review_requested.tpl
+++ b/dojo/templates/notifications/msteams/review_requested.tpl
@@ -29,10 +29,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/risk_acceptance_expiration.tpl b/dojo/templates/notifications/msteams/risk_acceptance_expiration.tpl
index babf9376e87..95e6279b5ff 100644
--- a/dojo/templates/notifications/msteams/risk_acceptance_expiration.tpl
+++ b/dojo/templates/notifications/msteams/risk_acceptance_expiration.tpl
@@ -35,10 +35,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/scan_added.tpl b/dojo/templates/notifications/msteams/scan_added.tpl
index af32887e9a4..52a67fd76c8 100644
--- a/dojo/templates/notifications/msteams/scan_added.tpl
+++ b/dojo/templates/notifications/msteams/scan_added.tpl
@@ -26,10 +26,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/sla_breach.tpl b/dojo/templates/notifications/msteams/sla_breach.tpl
index c74b7abea25..31ad6991bf0 100644
--- a/dojo/templates/notifications/msteams/sla_breach.tpl
+++ b/dojo/templates/notifications/msteams/sla_breach.tpl
@@ -34,10 +34,10 @@
                     }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/test_added.tpl b/dojo/templates/notifications/msteams/test_added.tpl
index 8d5515138ea..7b22e5d1314 100644
--- a/dojo/templates/notifications/msteams/test_added.tpl
+++ b/dojo/templates/notifications/msteams/test_added.tpl
@@ -26,10 +26,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/upcoming_engagement.tpl b/dojo/templates/notifications/msteams/upcoming_engagement.tpl
index 06cbbb2e1cc..9cb22d025d7 100644
--- a/dojo/templates/notifications/msteams/upcoming_engagement.tpl
+++ b/dojo/templates/notifications/msteams/upcoming_engagement.tpl
@@ -30,10 +30,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/msteams/user_mentioned.tpl b/dojo/templates/notifications/msteams/user_mentioned.tpl
index 5c09d1c7894..fb27ea5ad1b 100644
--- a/dojo/templates/notifications/msteams/user_mentioned.tpl
+++ b/dojo/templates/notifications/msteams/user_mentioned.tpl
@@ -25,10 +25,10 @@
                 }
             ]
         }
-        {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+        {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
             ,{
                 "activityTitle": "{% trans "Disclaimer" %}",
-                "text": "{{ system_settings.disclaimer }}"
+                "text": "{{ system_settings.disclaimer_notifications }}"
             }
         {% endif %}
     ],
diff --git a/dojo/templates/notifications/slack/engagement_added.tpl b/dojo/templates/notifications/slack/engagement_added.tpl
index 711fb2d7e77..212f0f5ee3c 100644
--- a/dojo/templates/notifications/slack/engagement_added.tpl
+++ b/dojo/templates/notifications/slack/engagement_added.tpl
@@ -3,8 +3,8 @@
 {% blocktranslate trimmed with name=engagement.name eng_product=engagement.product eng_url=url|full_url %}
 The engagement "{{ name }}" has been created in the product "{{ eng_product }}". It can be viewed here: {{ eng_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/other.tpl b/dojo/templates/notifications/slack/other.tpl
index 0bbe40eb8b2..f371af5263d 100644
--- a/dojo/templates/notifications/slack/other.tpl
+++ b/dojo/templates/notifications/slack/other.tpl
@@ -6,8 +6,8 @@
     More information on this event can be found here: {{ event_url }}
 {% endblocktranslate %}
 {% endif %}
-{% if system_settings.disclaimer|length %}
+{% if system_settings.disclaimer_notifications|length %}
 
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/product_added.tpl b/dojo/templates/notifications/slack/product_added.tpl
index ca57b54333a..6d1cef84455 100644
--- a/dojo/templates/notifications/slack/product_added.tpl
+++ b/dojo/templates/notifications/slack/product_added.tpl
@@ -3,8 +3,8 @@
 {% blocktranslate trimmed with prod_url=url|full_url %}
 The new product "{{ title }}" has been added. It can be viewed here: {{ prod_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/product_type_added.tpl b/dojo/templates/notifications/slack/product_type_added.tpl
index 914114ca437..8818a3f101a 100644
--- a/dojo/templates/notifications/slack/product_type_added.tpl
+++ b/dojo/templates/notifications/slack/product_type_added.tpl
@@ -3,8 +3,8 @@
 {% blocktranslate trimmed with prod_url=url|full_url %}
 The new product type "{{ title }}" has been added. It can be viewed here: {{ prod_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/report_created.tpl b/dojo/templates/notifications/slack/report_created.tpl
index 29b08597b1c..8c5ca4a9290 100644
--- a/dojo/templates/notifications/slack/report_created.tpl
+++ b/dojo/templates/notifications/slack/report_created.tpl
@@ -3,8 +3,8 @@
 {% blocktranslate trimmed with name=report.name report_url=url|full_url %}
 Your report "{{ name }}" is ready. It can be downloaded here: {{ report_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/review_requested.tpl b/dojo/templates/notifications/slack/review_requested.tpl
index 64a78af408f..395954e7745 100644
--- a/dojo/templates/notifications/slack/review_requested.tpl
+++ b/dojo/templates/notifications/slack/review_requested.tpl
@@ -15,7 +15,7 @@
 
 {% trans "Full details of the finding can be reviewed at" %} {{ url|full_url }}
 
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}    
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}    
     {% trans "Disclaimer:" %}
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/risk_acceptance_expiration.tpl b/dojo/templates/notifications/slack/risk_acceptance_expiration.tpl
index e3751c7abff..d5222c81826 100644
--- a/dojo/templates/notifications/slack/risk_acceptance_expiration.tpl
+++ b/dojo/templates/notifications/slack/risk_acceptance_expiration.tpl
@@ -11,8 +11,8 @@
 {% blocktranslate trimmed with risk_url=risk_acceptance_url|full_url %}
 Risk Acceptance can be viewed here: {{ risk_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/scan_added.tpl b/dojo/templates/notifications/slack/scan_added.tpl
index aa72932e8fa..97488ee6c0b 100644
--- a/dojo/templates/notifications/slack/scan_added.tpl
+++ b/dojo/templates/notifications/slack/scan_added.tpl
@@ -8,8 +8,8 @@
     They can be viewed here: {{ scan_url }}
   {% endblocktranslate %}
 {% endif %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/sla_breach.tpl b/dojo/templates/notifications/slack/sla_breach.tpl
index fc6913e005d..0e9d4ce9e5b 100644
--- a/dojo/templates/notifications/slack/sla_breach.tpl
+++ b/dojo/templates/notifications/slack/sla_breach.tpl
@@ -6,8 +6,8 @@ Title: {{title}}
 Severity: {{severity}}
 You can find details here: {{ sla_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/test_added.tpl b/dojo/templates/notifications/slack/test_added.tpl
index 38c9a9b752e..fddccc1e815 100644
--- a/dojo/templates/notifications/slack/test_added.tpl
+++ b/dojo/templates/notifications/slack/test_added.tpl
@@ -6,8 +6,8 @@ Title: {{title}}
 Type: {{ test_type }}
 You can find details here: {{ test_url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/upcoming_engagement.tpl b/dojo/templates/notifications/slack/upcoming_engagement.tpl
index 59f64529da3..1b2e80df6da 100644
--- a/dojo/templates/notifications/slack/upcoming_engagement.tpl
+++ b/dojo/templates/notifications/slack/upcoming_engagement.tpl
@@ -1,8 +1,8 @@
 {% load i18n %}{% blocktranslate trimmed with eng_product=engagement.product start=engagement.target_start %}
 The engagement "{{ eng_product }}" is starting on {{ start }}.
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/slack/user_mentioned.tpl b/dojo/templates/notifications/slack/user_mentioned.tpl
index 3d1cf778012..aba6c9aed6a 100644
--- a/dojo/templates/notifications/slack/user_mentioned.tpl
+++ b/dojo/templates/notifications/slack/user_mentioned.tpl
@@ -5,8 +5,8 @@ User {{ user }} jotted a note on {{ section }}:
 
 Full details of the note can be reviewed at {{ url }}
 {% endblocktranslate %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
     
     {% trans "Disclaimer" %}:
-    {{ system_settings.disclaimer }}
+    {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/templates/notifications/webhooks/subtemplates/base.tpl b/dojo/templates/notifications/webhooks/subtemplates/base.tpl
index 3b6e30da989..f8cb3e46bb8 100644
--- a/dojo/templates/notifications/webhooks/subtemplates/base.tpl
+++ b/dojo/templates/notifications/webhooks/subtemplates/base.tpl
@@ -9,6 +9,6 @@ url_ui:  {{ url|full_url }}
 {% if url_api %}
 url_api:  {{ url_api|full_url }}
 {% endif %}
-{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
-disclaimer:  {{ system_settings.disclaimer }}
+{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
+disclaimer:  {{ system_settings.disclaimer_notifications }}
 {% endif %}