diff --git a/application/Espo/Services/Email.php b/application/Espo/Services/Email.php
index 67835b0f09..e70b7e8383 100644
--- a/application/Espo/Services/Email.php
+++ b/application/Espo/Services/Email.php
@@ -273,7 +273,7 @@ class Email extends Record
                         $GLOBALS['log']->error("Send Email: Could not create Smtp Handler for {$emailAddress}. Error: " . $e->getMessage());
                     }
                     if (method_exists($handler, 'applyParams')) {
-                        $handler->applyParams($userId, $params);
+                        $handler->applyParams($userId, $emailAddress, $params);
                     }
                 }
             }
diff --git a/application/Espo/Services/EmailAccount.php b/application/Espo/Services/EmailAccount.php
index dc397b28e3..7d07810583 100644
--- a/application/Espo/Services/EmailAccount.php
+++ b/application/Espo/Services/EmailAccount.php
@@ -131,7 +131,7 @@ class EmailAccount extends Record
                             $GLOBALS['log']->error("EmailAccount: Could not create Imap Handler for {$emailAddress}. Error: " . $e->getMessage());
                         }
                         if (method_exists($handler, 'prepareProtocol')) {
-                            $imapParams = $handler->prepareProtocol($userId, $params);
+                            $imapParams = $handler->prepareProtocol($userId, $emailAddress, $params);
                         }
                     }
                 }