diff --git a/application/Espo/Resources/i18n/en_US/Settings.json b/application/Espo/Resources/i18n/en_US/Settings.json
index a69a002e66..dc8669ef6b 100644
--- a/application/Espo/Resources/i18n/en_US/Settings.json
+++ b/application/Espo/Resources/i18n/en_US/Settings.json
@@ -10,12 +10,9 @@
         "defaultCurrency": "Default Currency",
         "baseCurrency": "Base Currency",
         "currencyRates": "Rate Values",
-
         "currencyList": "Currency List",
         "language": "Language",
-
         "companyLogo": "Company Logo",
-
         "smtpServer": "Server",
         "smtpPort": "Port",
         "smtpAuth": "Auth",
@@ -26,16 +23,12 @@
         "outboundEmailFromName": "From Name",
         "outboundEmailFromAddress": "From Address",
         "outboundEmailIsShared": "Is Shared",
-
         "recordsPerPage": "Records Per Page",
         "recordsPerPageSmall": "Records Per Page (Small)",
         "tabList": "Tab List",
         "quickCreateList": "Quick Create List",
-
         "exportDelimiter": "Export Delimiter",
-
         "globalSearchEntityList": "Global Search Entity List",
-
         "authenticationMethod": "Authentication Method",
         "ldapHost": "Host",
         "ldapPort": "Port",
@@ -66,7 +59,8 @@
         }
     },
     "tooltips": {
-        "recordsPerPageSmall": "Count of records in relatinship panels."
+        "recordsPerPageSmall": "Count of records in relatinship panels.",
+        "outboundEmailIsShared": "Allow users to sent emails via this SMTP."
     },
     "labels": {
         "System": "System",
diff --git a/application/Espo/Resources/layouts/Settings/outboundEmail.json b/application/Espo/Resources/layouts/Settings/outboundEmails.json
similarity index 76%
rename from application/Espo/Resources/layouts/Settings/outboundEmail.json
rename to application/Espo/Resources/layouts/Settings/outboundEmails.json
index 6f0803883d..c26ec03836 100644
--- a/application/Espo/Resources/layouts/Settings/outboundEmail.json
+++ b/application/Espo/Resources/layouts/Settings/outboundEmails.json
@@ -11,8 +11,8 @@
     {
         "label": "Configuration",
         "rows": [
-            [{"name": "outboundEmailFromName"}, {"name": "outboundEmailFromAddress"}],
-            [{"name": "outboundEmailIsShared"}]
+            [{"name": "outboundEmailFromAddress"}, {"name": "outboundEmailIsShared"}],
+            [{"name": "outboundEmailFromName"}]
         ]
     }
 ]
diff --git a/application/Espo/Resources/metadata/app/adminPanel.json b/application/Espo/Resources/metadata/app/adminPanel.json
index 52ce20244d..a3059b89c9 100644
--- a/application/Espo/Resources/metadata/app/adminPanel.json
+++ b/application/Espo/Resources/metadata/app/adminPanel.json
@@ -78,7 +78,7 @@
       "label":"Email",
       "items":[
          {
-            "url":"#Admin/outboundEmail",
+            "url":"#Admin/outboundEmails",
             "label":"Outbound Emails",
             "description":"outboundEmails"
          },
diff --git a/application/Espo/Resources/metadata/entityDefs/Settings.json b/application/Espo/Resources/metadata/entityDefs/Settings.json
index 567f0ef5b9..1f427d8bbb 100644
--- a/application/Espo/Resources/metadata/entityDefs/Settings.json
+++ b/application/Espo/Resources/metadata/entityDefs/Settings.json
@@ -73,7 +73,8 @@
         },
         "outboundEmailIsShared": {
             "type": "bool",
-            "default": false
+            "default": false,
+            "tooltip": true
         },
         "outboundEmailFromName": {
             "type": "varchar",
diff --git a/frontend/client/res/templates/admin/settings/header-outbound-email.tpl b/frontend/client/res/templates/admin/settings/header-outbound-emails.tpl
similarity index 56%
rename from frontend/client/res/templates/admin/settings/header-outbound-email.tpl
rename to frontend/client/res/templates/admin/settings/header-outbound-emails.tpl
index 96a6eaab1f..e208b4b50f 100644
--- a/frontend/client/res/templates/admin/settings/header-outbound-email.tpl
+++ b/frontend/client/res/templates/admin/settings/header-outbound-emails.tpl
@@ -1 +1 @@
-<h3><a href="#Admin">{{translate 'Administration'}}</a> &raquo {{translate 'Outbound Email' scope='Admin'}}</h3>
+<h3><a href="#Admin">{{translate 'Administration'}}</a> &raquo {{translate 'Outbound Emails' scope='Admin'}}</h3>
diff --git a/frontend/client/src/controllers/admin.js b/frontend/client/src/controllers/admin.js
index 4720b571fd..0caf6e2b54 100644
--- a/frontend/client/src/controllers/admin.js
+++ b/frontend/client/src/controllers/admin.js
@@ -102,7 +102,7 @@ Espo.define('Controllers.Admin', 'Controller', function (Dep) {
             model.fetch();
         },
 
-        outboundEmail: function () {
+        outboundEmails: function () {
             var model = this.getSettingsModel();
 
             model.once('sync', function () {
@@ -110,8 +110,8 @@ Espo.define('Controllers.Admin', 'Controller', function (Dep) {
                 this.main('Edit', {
                     model: model,
                     views: {
-                        header: {template: 'admin.settings.header-outbound-email'},
-                        body: {view: 'Admin.OutboundEmail'},
+                        header: {template: 'admin.settings.header-outbound-emails'},
+                        body: {view: 'Admin.OutboundEmails'},
                     },
                 });
             }, this);
diff --git a/frontend/client/src/views/admin/outbound-email.js b/frontend/client/src/views/admin/outbound-emails.js
similarity index 94%
rename from frontend/client/src/views/admin/outbound-email.js
rename to frontend/client/src/views/admin/outbound-emails.js
index dcffcc38fc..be6b512f03 100644
--- a/frontend/client/src/views/admin/outbound-email.js
+++ b/frontend/client/src/views/admin/outbound-emails.js
@@ -19,11 +19,11 @@
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
  ************************************************************************/
 
-Espo.define('Views.Admin.OutboundEmail', 'Views.Settings.Record.Edit', function (Dep) {
+Espo.define('Views.Admin.OutboundEmails', 'Views.Settings.Record.Edit', function (Dep) {
 
     return Dep.extend({
 
-        layoutName: 'outboundEmail',
+        layoutName: 'outboundEmails',
 
         dependencyDefs: {
             'smtpAuth': {