diff --git a/application/Espo/Core/Binding/DefaultBinding.php b/application/Espo/Core/Binding/DefaultBinding.php
index 0f0cc59277..d8d4195329 100644
--- a/application/Espo/Core/Binding/DefaultBinding.php
+++ b/application/Espo/Core/Binding/DefaultBinding.php
@@ -249,6 +249,10 @@ class DefaultBinding implements BindingProcessor
             ->bindFactory(
                 'Espo\\Core\\Mail\\Account\\Fetcher',
                 'Espo\\Core\\Mail\\Account\\PersonalAccountFetcherFactory'
+            )
+            ->bindImplementation(
+                'Espo\\Core\\Mail\\Account\\StorageFactory',
+                'Espo\\Core\\Mail\\Account\\PersonalAccountStorageFactory'
             );
 
         $binder
@@ -256,6 +260,10 @@ class DefaultBinding implements BindingProcessor
             ->bindFactory(
                 'Espo\\Core\\Mail\\Account\\Fetcher',
                 'Espo\\Core\\Mail\\Account\\GroupAccountFetcherFactory'
+            )
+            ->bindImplementation(
+                'Espo\\Core\\Mail\\Account\\StorageFactory',
+                'Espo\\Core\\Mail\\Account\\GroupAccountStorageFactory'
             );
     }
 }
diff --git a/application/Espo/Core/Mail/Account/GroupAccountService.php b/application/Espo/Core/Mail/Account/GroupAccountService.php
index c5ab5d4c88..c9d450cdbd 100644
--- a/application/Espo/Core/Mail/Account/GroupAccountService.php
+++ b/application/Espo/Core/Mail/Account/GroupAccountService.php
@@ -46,13 +46,13 @@ class GroupAccountService
 
     private Crypt $crypt;
 
-    private GroupAccountStorageFactory $storageFactory;
+    private StorageFactory $storageFactory;
 
     public function __construct(
         Fetcher $fetcher,
         GroupAccountFactory $accountFactory,
         Crypt $crypt,
-        GroupAccountStorageFactory $storageFactory
+        StorageFactory $storageFactory
     ) {
         $this->fetcher = $fetcher;
         $this->accountFactory = $accountFactory;
diff --git a/application/Espo/Core/Mail/Account/PersonalAccountService.php b/application/Espo/Core/Mail/Account/PersonalAccountService.php
index 66184e7cc1..c1bd36ee07 100644
--- a/application/Espo/Core/Mail/Account/PersonalAccountService.php
+++ b/application/Espo/Core/Mail/Account/PersonalAccountService.php
@@ -49,7 +49,7 @@ class PersonalAccountService
 
     private Crypt $crypt;
 
-    private PersonalAccountStorageFactory $storageFactory;
+    private StorageFactory $storageFactory;
 
     private User $user;
 
@@ -57,7 +57,7 @@ class PersonalAccountService
         Fetcher $fetcher,
         PersonalAccountFactory $accountFactory,
         Crypt $crypt,
-        PersonalAccountStorageFactory $storageFactory,
+        StorageFactory $storageFactory,
         User $user
     ) {
         $this->fetcher = $fetcher;