diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Email.php b/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
index 64bc115cd8..c703cc1bf5 100644
--- a/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
+++ b/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
@@ -166,7 +166,7 @@ class Email extends Base
                 'order' => [
                     ['emailAddresses.lower', '{direction}'],
                 ],
-                'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => 1]]],
+                'leftJoins' => [['emailAddresses', 'emailAddresses', ['primary' => true]]],
                 'additionalSelect' => ['emailAddresses.lower'],
             ],
         ];
diff --git a/application/Espo/Repositories/EmailAddress.php b/application/Espo/Repositories/EmailAddress.php
index af6b7daf11..83667e71d5 100644
--- a/application/Espo/Repositories/EmailAddress.php
+++ b/application/Espo/Repositories/EmailAddress.php
@@ -331,7 +331,7 @@ class EmailAddress extends Database implements
             ->join(
                 EmailAddressEntity::ENTITY_TYPE,
                 'ea',
-                ['ea.id:' => 'emailAddressId', 'ea.deleted' => 0]
+                ['ea.id:' => 'emailAddressId', 'ea.deleted' => false]
             )
             ->where('ea.lower=', strtolower($address))
             ->order([