diff --git a/dojo/templates/notifications/alert/user_mentioned.tpl b/dojo/templates/notifications/alert/user_mentioned.tpl
index 1fc741ee2d7..9a0b35c0470 100644
--- a/dojo/templates/notifications/alert/user_mentioned.tpl
+++ b/dojo/templates/notifications/alert/user_mentioned.tpl
@@ -1,4 +1,4 @@
 {% load i18n %}{% blocktranslate trimmed %}
-User {{ user }} jotted a note on {{ section }}{% endblocktranslate %}:
+User {{ requested_by }} jotted a note on {{ section }}{% endblocktranslate %}:
 
     {{ note }}
\ No newline at end of file
diff --git a/dojo/templates/notifications/mail/user_mentioned.tpl b/dojo/templates/notifications/mail/user_mentioned.tpl
index 9601da3c9a5..d828940400d 100644
--- a/dojo/templates/notifications/mail/user_mentioned.tpl
+++ b/dojo/templates/notifications/mail/user_mentioned.tpl
@@ -9,7 +9,7 @@
             </p>
             <p>
               {% blocktranslate trimmed %}
-                User {{ user }} jotted a note on {{ section }}:<br/>
+                User {{ requested_by }} jotted a note on {{ section }}:<br/>
                 <br/>
                 {{ note }}<br/>
                 <br/>
diff --git a/dojo/templates/notifications/msteams/user_mentioned.tpl b/dojo/templates/notifications/msteams/user_mentioned.tpl
index ed8f38ee80c..aba4d11c089 100644
--- a/dojo/templates/notifications/msteams/user_mentioned.tpl
+++ b/dojo/templates/notifications/msteams/user_mentioned.tpl
@@ -54,7 +54,7 @@ NOTE: This template is currently NOT USED in practice because:
                     },
                     {
                         "type": "TextBlock",
-                        "text": "{% trans 'User' %} {{ user }} {% trans 'mentioned you in' %} {{ section }}.",
+                        "text": "{% trans 'User' %} {{ requested_by }} {% trans 'mentioned you in' %} {{ section }}.",
                         "wrap": true,
                         "spacing": "Medium"
                     },
@@ -63,7 +63,7 @@ NOTE: This template is currently NOT USED in practice because:
                         "facts": [
                             {
                                 "title": "{% trans 'User' %}:",
-                                "value": "{{ user }}"
+                                "value": "{{ requested_by }}"
                             },
                             {
                                 "title": "{% trans 'Section' %}:",
diff --git a/dojo/templates/notifications/slack/user_mentioned.tpl b/dojo/templates/notifications/slack/user_mentioned.tpl
index aba6c9aed6a..9131de845a8 100644
--- a/dojo/templates/notifications/slack/user_mentioned.tpl
+++ b/dojo/templates/notifications/slack/user_mentioned.tpl
@@ -1,12 +1,12 @@
 {% load i18n %}{% blocktranslate trimmed %}
-User {{ user }} jotted a note on {{ section }}:
+User {{ requested_by }} jotted a note on {{ section }}:
 
 {{ note }}
 
 Full details of the note can be reviewed at {{ url }}
 {% endblocktranslate %}
 {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
-    
+
     {% trans "Disclaimer" %}:
     {{ system_settings.disclaimer_notifications }}
 {% endif %}
diff --git a/dojo/utils.py b/dojo/utils.py
index 414a8600a6f..07709c4bbbf 100644
--- a/dojo/utils.py
+++ b/dojo/utils.py
@@ -1461,7 +1461,8 @@ def process_tag_notifications(request, note, parent_url, parent_title):
         title=f"{request.user} jotted a note",
         url=parent_url,
         icon="commenting",
-        recipients=users_to_notify)
+        recipients=users_to_notify,
+        requested_by=get_current_user())
 
 
 def encrypt(key, iv, plaintext):