diff --git a/wcs/qommon/emails.py b/wcs/qommon/emails.py
index ce4398f3d..6dea6073a 100644
--- a/wcs/qommon/emails.py
+++ b/wcs/qommon/emails.py
@@ -160,7 +160,6 @@ def email(
     replyto=None,
     bcc=None,
     email_from=None,
-    exclude_current_user=False,
     email_type=None,
     want_html=True,
     hide_recipients=False,
@@ -329,11 +328,6 @@ def email(
     if bcc:
         rcpts += bcc
 
-    if exclude_current_user:
-        user = get_request().user
-        if user and user.email and user.email in rcpts:
-            rcpts.remove(user.email)
-
     rcpts = [x for x in rcpts if x]
     if len(rcpts) == 0:
         return
diff --git a/wcs/qommon/ident/password.py b/wcs/qommon/ident/password.py
index f6450816b..267fe58ba 100644
--- a/wcs/qommon/ident/password.py
+++ b/wcs/qommon/ident/password.py
@@ -373,9 +373,7 @@ class MethodDirectory(Directory):
         }
 
         try:
-            emails.custom_template_email(
-                'change-password-request', data, user.email, exclude_current_user=False
-            )
+            emails.custom_template_email('change-password-request', data, user.email)
         except errors.EmailError:
             form.set_error('username', _('Failed to send email (server error)'))
             token.remove_self()
@@ -482,9 +480,7 @@ class MethodDirectory(Directory):
                     'hostname': get_request().get_server(),
                 }
 
-                emails.custom_template_email(
-                    'new-generated-password', data, user.email, exclude_current_user=False
-                )
+                emails.custom_template_email('new-generated-password', data, user.email)
 
                 return self.forgotten_token_end_page()
             else:
diff --git a/wcs/workflows.py b/wcs/workflows.py
index 66e69f9e8..1e742c79f 100644
--- a/wcs/workflows.py
+++ b/wcs/workflows.py
@@ -2979,7 +2979,6 @@ class SendmailWorkflowStatusItem(WorkflowStatusItem):
                 email_rcpt=None,
                 bcc=addresses,
                 email_from=email_from,
-                exclude_current_user=False,
                 attachments=attachments,
                 fire_and_forget=True,
             )
@@ -2989,7 +2988,6 @@ class SendmailWorkflowStatusItem(WorkflowStatusItem):
                 mail_body,
                 email_rcpt=addresses,
                 email_from=email_from,
-                exclude_current_user=False,
                 attachments=attachments,
                 fire_and_forget=True,
             )