diff --git a/.github/changed-lines-count-labeler.yml b/.github/changed-lines-count-labeler.yml
deleted file mode 100644
index 39e663821fb..00000000000
--- a/.github/changed-lines-count-labeler.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add this tag for any changes for more than 1 line
-"Pending analysis of PR (maintenance team)":
-  min: 1
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index db674a40dd4..205c6311d76 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -641,7 +641,7 @@ class FormMail extends Form
 
 						// Add also email aliases from the c_email_senderprofile table
 						$sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile";
-						$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")";
+						$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).") AND entity in getEntity('c_email_senderprofile')";
 						$sql .= " ORDER BY position";
 						$resql = $this->db->query($sql);
 						if ($resql) {