diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56b958bb6..94489398e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@ and this project adheres to
 * [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
 * [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
 * [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
+* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
 
 ## Test releases
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 7bde8a524..de7946ad3 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -1572,6 +1572,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             $email = '';
         }
 
+        $email = trim($email);
+
         $this->email = $email;
 
         return $this;
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 16260ec97..9c3d6fd7e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -762,6 +762,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      */
     public function setEmail($email = null)
     {
+        $email = trim($email);
         $this->email = $email;
 
         return $this;