diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index 1296d4d5a..485f0ffeb 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -247,9 +247,9 @@
                 "url": "Server URL"
             },
             "cloudflarePortWarning": "Cloudflare proxying must be disabled on the dashboard domain to access the LDAP server",
-            "enable": "Enable LDAP Server",
+            "enable": "Enable LDAP server",
             "title": "LDAP Server",
-            "enabled": "Enable LDAP Server"
+            "enabled": "Enable LDAP server"
         },
         "title": "Users"
     },
@@ -1012,7 +1012,7 @@
             },
             "catchall": {
                 "title": "Catch-all",
-                "description": "Emails sent to non existing addresses will be forwarded to the following mailboxes.",
+                "description": "Emails sent to non-existing addresses will be forwarded to the following mailboxes",
                 "saveAction": "Save"
             },
             "incomingServerInfo": "Incoming Mail (IMAP)",
@@ -1020,16 +1020,16 @@
             "incomingUserInfo": "Username",
             "incomingPasswordInfo": "Password",
             "incomingPasswordUsage": "Password of the owner of the mailbox",
-            "description": "Receive incoming emails for this domain."
+            "description": "Receive incoming emails for this domain"
         },
         "outbound": {
             "title": "Email Relay",
-            "description": "This mail server (Smart host) will be used to send the outbound mails of apps installed under this domain.",
-            "noopAdminDomainWarning": "Cloudron cannot send user invites, password reset and other notifications when email is disabled on the primary domain",
-            "noopNonAdminDomainWarning": "Cloudron cannot provide email sending for apps hosted under this domain when email is disabled.",
+            "description": "Configure outbound mail delivery for this domain",
+            "noopAdminDomainWarning": "Cloudron cannot send user invites, password reset and other notifications when outbound email is disabled on the primary domain",
+            "noopNonAdminDomainWarning": "No email will be sent from this domain",
             "mailRelay": {
-                "host": "SMTP Host",
-                "port": "SMTP Port (STARTTLS)",
+                "host": "SMTP host",
+                "port": "SMTP port (STARTTLS)",
                 "selfsignedCheckbox": "Accept self-signed certificate",
                 "apiTokenOrKey": "API Token/Key",
                 "username": "Username",
@@ -1039,9 +1039,11 @@
         },
         "signature": {
             "title": "Email Signature",
-            "description": "The text here will be attached to all emails going out from this domain.",
-            "plainTextFormat": "Text Format",
-            "htmlFormat": "HTML Format"
+            "description": "The text here will be attached to all outbound mail from this domain.",
+            "plainTextFormat": "Text format",
+            "htmlFormat": "HTML format",
+            "customSignatureSet": "Custom signature configured",
+            "noSignatureSet": "No signature configured"
         },
         "dnsStatus": {
             "description": "Status of DNS Records may show an error while DNS is propagating (~5 minutes). See the <a href=\"{{ emailDnsDocsLink }}\" target=\"_blank\">troubleshooting</a> docs for help.",
@@ -1117,8 +1119,8 @@
         },
         "howToConnectInfoModal": "Configuring Email Clients",
         "customFrom": {
-            "title": "Allow Custom From",
-            "description": "Lets authenticated users and apps send emails using any From address."
+            "title": "Allow custom from address",
+            "description": "Let authenticated users and apps use any from address"
         }
     },
     "app": {
@@ -1232,7 +1234,7 @@
         },
         "email": {
             "from": {
-                "title": "Mail From Address",
+                "title": "Mail from address",
                 "mailboxPlaceholder": "Mailbox name",
                 "saveAction": "Save",
                 "enable": "Use Cloudron Mail to send email",
diff --git a/dashboard/src/components/MailRelaySettingsItem.vue b/dashboard/src/components/MailRelaySettingsItem.vue
index eef0c64fe..55431ef14 100644
--- a/dashboard/src/components/MailRelaySettingsItem.vue
+++ b/dashboard/src/components/MailRelaySettingsItem.vue
@@ -8,7 +8,8 @@ import { RELAY_PROVIDERS } from '../constants.js';
 import { prettyRelayProviderName } from '../utils';
 
 const props = defineProps({
-  domain: { type: String, required: true }
+  domain: { type: String, required: true },
+  adminDomain: { type: String, required: true }
 });
 
 const mailModel = MailModel.create();
@@ -22,7 +23,6 @@ const mailConfig = ref({});
 const dialog = useTemplateRef('dialog');
 const busy = ref(false);
 const formError = ref('');
-const adminDomain = ref('');
 const currentProvider = ref('cloudron-smtp');
 const provider = ref('cloudron-smtp');
 const host = ref('');
@@ -213,7 +213,7 @@ onMounted(async () => {
       <FormGroup>
         <label>{{ $t('email.outbound.title') }} <sup><a href="https://docs.cloudron.io/email/#relay-outbound-mails" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
         <div>
-          <b>{{ prettyRelayProviderName(currentProvider) }}</b> - <span v-html="$t('email.outbound.description')"></span>
+          <span>{{ prettyRelayProviderName(currentProvider) }}</span> / <span v-html="$t('email.outbound.description')"></span>
         </div>
       </FormGroup>
       <div style="display: flex; align-items: center;">
diff --git a/dashboard/src/constants.js b/dashboard/src/constants.js
index 478163e3f..984ed9f6b 100644
--- a/dashboard/src/constants.js
+++ b/dashboard/src/constants.js
@@ -331,7 +331,7 @@ const RELAY_PROVIDERS = [
   { provider: 'postmark-smtp', name: 'Postmark', host: 'smtp.postmarkapp.com', port: 587, spfDoc: 'https://postmarkapp.com/support/article/1092-how-do-i-set-up-spf-for-postmark' },
   { provider: 'sendgrid-smtp', name: 'SendGrid', host: 'smtp.sendgrid.net', port: 587, username: 'apikey', spfDoc: 'https://sendgrid.com/docs/ui/account-and-settings/spf-records/' },
   { provider: 'sparkpost-smtp', name: 'SparkPost', host: 'smtp.sparkpostmail.com', port: 587, username: 'SMTP_Injection', spfDoc: 'https://www.sparkpost.com/resources/email-explained/spf-sender-policy-framework/' },
-  { provider: 'noop', name: 'Disable' },
+  { provider: 'noop', name: 'Disabled' },
 ];
 
 // named exports
diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index c8ea95cf7..99985e745 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -256,6 +256,8 @@ onMounted(async () => {
        reject-style="secondary"
       @confirm="onSubmitSignature()"
     >
+      <p v-html="$t('email.signature.description')"></p>
+
       <div>
         <form @submit.prevent="onSubmitSignature()" autocomplete="off">
           <fieldset :disabled="signatureBusy">
@@ -285,7 +287,7 @@ onMounted(async () => {
         <Button @click="onSendTestMail">{{ $t('emails.domains.testEmailTooltip') }}</Button>
       </template>
 
-      <MailRelaySettingsItem v-if="domain" :domain="domain"/>
+      <MailRelaySettingsItem v-if="domain" :domain="domain" :adminDomain="adminDomain"/>
 
       <SettingsItem>
         <FormGroup>
@@ -298,7 +300,8 @@ onMounted(async () => {
       <SettingsItem>
         <FormGroup>
           <label>{{ $t('email.signature.title') }}</label>
-          <div v-html="$t('email.signature.description')"></div>
+          <div v-if="signatureHtml || signatureText">{{ $t('email.signature.customSignatureSet') }}</div>
+          <div v-else>{{ $t('email.signature.noSignatureSet') }}</div>
         </FormGroup>
         <div style="display: flex; align-items: center">
           <Button tool plain @click="onShowSignatureDialog()">{{ $t('main.dialog.edit') }}</Button>