diff --git a/application/Espo/Services/Settings.php b/application/Espo/Services/Settings.php
index 886e63da2e..3e95dcc213 100644
--- a/application/Espo/Services/Settings.php
+++ b/application/Espo/Services/Settings.php
@@ -158,7 +158,13 @@ class Settings extends \Espo\Core\Services\Base
     {
         if ($this->getUser()->isSystem()) return;
 
-        if (!$this->getAcl()->checkScope('Email', 'create')) {
+        if ($this->getUser()->isAdmin()) return;
+
+        if (
+            !$this->getAcl()->checkScope('Email', 'create')
+            ||
+            !$this->getConfig()->get('outboundEmailIsShared')
+        ) {
             unset($data->outboundEmailFromAddress);
             unset($data->outboundEmailFromName);
             unset($data->outboundEmailBccAddress);