diff --git a/backend/services/messaging/message_service.py b/backend/services/messaging/message_service.py
index 05102691e3..2a8861dbc4 100644
--- a/backend/services/messaging/message_service.py
+++ b/backend/services/messaging/message_service.py
@@ -194,9 +194,13 @@ def _push_messages(messages):
                 and obj.message_type == MessageType.TASK_COMMENT_NOTIFICATION.value
             ):
                 continue
-            if user.tasks_notifications is False and obj.message_type in (
-                MessageType.VALIDATION_NOTIFICATION.value,
-                MessageType.INVALIDATION_NOTIFICATION.value,
+            # Don't send email alerts for task validation messages
+            if obj.message_type == MessageType.VALIDATION_NOTIFICATION.value:
+                messages_objs.append(obj)
+                continue
+            if (
+                user.tasks_notifications is False
+                and obj.message_type == MessageType.INVALIDATION_NOTIFICATION.value
             ):
                 messages_objs.append(obj)
                 continue
diff --git a/frontend/src/components/user/messages.js b/frontend/src/components/user/messages.js
index e310092431..f65fb9fc74 100644
--- a/frontend/src/components/user/messages.js
+++ b/frontend/src/components/user/messages.js
@@ -148,7 +148,7 @@ export default defineMessages({
   },
   taskUpdates: {
     id: 'user.notifications.tasks',
-    defaultMessage: 'Tasks validation emails',
+    defaultMessage: 'Tasks invalidation emails',
   },
   required: {
     id: 'user.settings.required',
@@ -160,7 +160,7 @@ export default defineMessages({
   },
   taskUpdatesDescription: {
     id: 'user.notifications.task.description',
-    defaultMessage: 'Receive an email when a task you have contributed to is validated.',
+    defaultMessage: 'Receive an email when a task you have contributed to requires more mapping.',
   },
   questionsAndComments: {
     id: 'user.notifications.questionsAndComments',
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f22aa37666..e889e64bf1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -182,6 +182,7 @@
   "browser.webgl.unsupported.description": "Your browser does not support WebGL, which is required to render map components. Please try using a different browser or check that <a>WebGL is enabled</a>.",
   "common.loading": "Loading...",
   "notifications.mainSection.title": "Notifications",
+  "notifications.singular.notification": "notification",
   "notifications.filter.all": "All",
   "notifications.filter.messages": "Messages",
   "notifications.bodytitle.message": "Message",
@@ -825,6 +826,9 @@
   "management.teams.join_requests.empty": "There aren't any requests to join the team.",
   "management.teams": "Teams",
   "management.team": "Team",
+  "user.team.leaveTeam": "Leave the team",
+  "user.team.leaveTeam.description": "Are you sure you want to leave <b>{name}</b>?",
+  "user.team.leaveTeam.button.leave": "Leave",
   "management.projects": "Projects",
   "management.projects.stale": "Stale",
   "management.projects.created_this_year": "Created this year",
@@ -967,10 +971,10 @@
   "user.notifications.teams": "Team announcements emails",
   "user.notifications.teams.description": "Receive emails with announcements sent by team managers.",
   "user.notifications.projects": "Project updates",
-  "user.notifications.tasks": "Tasks validation emails",
+  "user.notifications.tasks": "Tasks invalidation emails",
   "user.settings.required": "Required fields",
   "user.notifications.projects.description": "You get a notification when a project you have contributed to makes progress.",
-  "user.notifications.task.description": "Receive an email when a task you have contributed to is validated.",
+  "user.notifications.task.description": "Receive an email when a task you have contributed to requires more mapping.",
   "user.notifications.questionsAndComments": "Questions and comments",
   "user.notifications.questionsAndComments.description": "Receive a notification every time someone posts in the 'Questions and comments' section of the projects you have contributed to or created.",
   "user.notifications.taskComments": "Task comments",