diff --git a/application/Espo/Repositories/Email.php b/application/Espo/Repositories/Email.php
index 35467be288..c135a33330 100644
--- a/application/Espo/Repositories/Email.php
+++ b/application/Espo/Repositories/Email.php
@@ -99,15 +99,15 @@ class Email extends \Espo\Core\ORM\Repositories\RDB
             }
         }
 
-        $nameHash = array();
-        $typeHash = array();
-        $idHash = array();
+        $nameHash = (object) [];
+        $typeHash = (object) [];
+        $idHash = (object) [];
         foreach ($addressList as $address) {
             $p = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddress($address);
             if ($p) {
-                $nameHash[$address] = $p->get('name');
-                $typeHash[$address] = $p->getEntityName();
-                $idHash[$address] = $p->id;
+                $nameHash->$address = $p->get('name');
+                $typeHash->$address = $p->getEntityName();
+                $idHash->$address = $p->id;
             }
         }
 
diff --git a/frontend/client/src/views/email/fields/from-address-varchar.js b/frontend/client/src/views/email/fields/from-address-varchar.js
index 71a3da5fa9..c2baab157a 100644
--- a/frontend/client/src/views/email/fields/from-address-varchar.js
+++ b/frontend/client/src/views/email/fields/from-address-varchar.js
@@ -165,7 +165,7 @@ Espo.define('views/email/fields/from-address-varchar', 'views/fields/varchar', f
                 attributes.lastName = lastName;
             }
 
-            var viewName = this.getMetadata().get('clientDefs.' + scope + '.modalViews.edit') || 'Modals.Edit';
+            var viewName = this.getMetadata().get('clientDefs.' + scope + '.modalViews.edit') || 'views/modals/edit';
 
             this.createView('create', viewName, {
                 scope: scope,
@@ -185,12 +185,14 @@ Espo.define('views/email/fields/from-address-varchar', 'views/fields/varchar', f
                     this.nameHash = nameHash;
                     this.typeHash = typeHash;
 
+                    var attributes = {
+                        nameHash: nameHash,
+                        idHash: idHash,
+                        typeHash: typeHash
+                    };
+
                     setTimeout(function () {
-                        this.model.set({
-                            nameHash: nameHash,
-                            idHash: idHash,
-                            typeHash: typeHash
-                        });
+                        this.model.set(attributes);
                     }.bind(this), 50);
                 }, this);
             }.bind(this));