diff --git a/application/Espo/Core/ORM/Repository.php b/application/Espo/Core/ORM/Repository.php
index dba5d9018a..3f787e6ac5 100644
--- a/application/Espo/Core/ORM/Repository.php
+++ b/application/Espo/Core/ORM/Repository.php
@@ -102,75 +102,43 @@ class Repository extends \Espo\ORM\Repository
 			$email = $entity->get('emailAddress');			
 			$pdo = $this->getPDO();
 			
+			$emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress');
+			
 			if (!empty($email)) {
-				if ($email != $entity->getFetchedValue('emailAddress')) {
-					$emailAddressRepository = $this->getEntityManager()->getRepository('EmailAddress');
-					$emailAddress = $emailAddressRepository->where(array('lower' => strtolower($email)))->findOne();
+				if ($email != $entity->getFetchedValue('emailAddress')) {					
+					
+					$emailAddressNew = $emailAddressRepository->where(array('lower' => strtolower($email)))->findOne();									
 					$isNewEmailAddress = false;
-					if (!$emailAddress) {
-						$emailAddress = $emailAddressRepository->get();
-						$emailAddress->set('name', $email);
-						$emailAddressRepository->save($emailAddress);						
+					if (!$emailAddressNew) {
+						$emailAddressNew = $emailAddressRepository->get();
+						$emailAddressNew->set('name', $email);
+						$emailAddressRepository->save($emailAddressNew);						
 						$isNewEmailAddress = true;
 					}
 					
+					$emailOld = $entity->getFetchedValue('emailAddress');					
+					if (!empty($emailOld)) {
+						$emailAddressOld = $emailAddressRepository->where(array('lower' => strtolower($emailOld)))->findOne();					
+						$this->unrelate($entity, 'emailAddresses', $emailAddressOld);
+					}					
+					$this->relate($entity, 'emailAddresses', $emailAddressNew);
+					
 					$query = "
 						UPDATE entity_email_address 
-						SET `primary` = 0
+						SET `primary` = 1
 						WHERE
 							entity_id = ".$pdo->quote($entity->id)." AND
-							entity_type = ".$pdo->quote($this->entityName)."						
+							entity_type = ".$pdo->quote($this->entityName)." AND
+							email_address_id = ".$pdo->quote($emailAddressNew->id)."							
 					";
 					$sth = $pdo->prepare($query);
 					$sth->execute();
-					
-					$sth = null;
-					if (!$isNewEmailAddress) {
-						$query = "
-							SELECT * FROM entity_email_address 
-							WHERE
-								entity_id = ".$pdo->quote($entity->id)." AND
-								entity_type = ".$pdo->quote($this->entityName)." AND
-								email_address_id = ".$pdo->quote($emailAddress->id)."							
-						";
-						$sth = $pdo->prepare($query);
-						$sth->execute();
-					}
-					if (!$isNewEmailAddress && $sth->fetch()) {						
-						$query = "
-							UPDATE entity_email_address 
-							SET `primary` = 1
-							WHERE
-								entity_id = ".$pdo->quote($entity->id)." AND
-								entity_type = ".$pdo->quote($this->entityName)." AND
-								email_address_id = ".$pdo->quote($emailAddress->id)."							
-						";
-						$sth = $pdo->prepare($query);
-						$sth->execute();						
-					} else {
-						$query = "
-							INSERT INTO entity_email_address  
-							(entity_id, entity_type, email_address_id, `primary`)
-							VALUES
-							(".$pdo->quote($entity->id).", ".$pdo->quote($this->entityName).", ".$pdo->quote($emailAddress->id).", 1)					
-						";
-
-						$sth = $pdo->prepare($query);
-						$sth->execute();
-					}					
 				}
 			} else {
-				$fetched = $entity->getFetchedValue('emailAddress');
-				if (!empty($fetched)) {
-						$query = "
-							DELETE FROM entity_email_address  
-							WHERE
-								entity_id = ".$pdo->quote($entity->id)." AND
-								entity_type = ".$pdo->quote($this->entityName)." AND
-								primary = 1				
-						";
-						$sth = $pdo->prepare($query);
-						$sth->execute();
+				$emailOld = $entity->getFetchedValue('emailAddress');
+				if (!empty($emailOld)) {
+					$emailAddressOld = $emailAddressRepository->where(array('lower' => strtolower($emailOld)))->findOne();					
+					$this->unrelate($entity, 'emailAddresses', $emailAddressOld);						
 				}
 			}					
 		}