diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
index 09c2035323..8309fcb4b7 100644
--- a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
+++ b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
@@ -346,6 +346,8 @@ class Saver implements SaverInterface
         if ($primary) {
             $emailAddress = $this->getByAddress($primary);
 
+            $entity->set(self::ATTR_EMAIL_ADDRESS, $primary);
+
             if ($emailAddress) {
                 $update1 = $this->entityManager
                     ->getQueryBuilder()
diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
index 2f7716dfe0..c3529339f3 100644
--- a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
+++ b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
@@ -352,6 +352,8 @@ class Saver implements SaverInterface
         if ($primary) {
             $phoneNumber = $this->getByNumber($primary);
 
+            $entity->set(self::ATTR_PHONE_NUMBER, $primary);
+
             if ($phoneNumber) {
                 $update1 = $this->entityManager
                     ->getQueryBuilder()