diff --git a/dashboard/src/components/MailRelaySettingsItem.vue b/dashboard/src/components/MailRelaySettingsItem.vue
index fcc7eaf06..ce5e748c4 100644
--- a/dashboard/src/components/MailRelaySettingsItem.vue
+++ b/dashboard/src/components/MailRelaySettingsItem.vue
@@ -1,33 +1,18 @@
 <script setup>
 
-import { ref, useTemplateRef, computed } from 'vue';
+import { ref, useTemplateRef, computed, onMounted } from 'vue';
 import { Button, Dialog, FormGroup, SingleSelect, TextInput, NumberInput, Checkbox, MaskedInput } from '@cloudron/pankow';
 import SettingsItem from './SettingsItem.vue';
 import MailModel from '../models/MailModel.js';
+import { RELAY_PROVIDERS } from '../constants.js';
+import { prettyRelayProviderName } from '../utils';
 
 const props = defineProps(['domain']);
 
 const mailModel = MailModel.create();
 
-const providers = [
-  { provider: 'cloudron-smtp', name: 'Built-in SMTP server' },
-  { provider: 'external-smtp', name: 'External SMTP server', host: '', port: 587 },
-  { provider: 'external-smtp-noauth', name: 'External SMTP server (No Authentication)', host: '', port: 587 },
-  { provider: 'ses-smtp', name: 'Amazon SES', host: 'email-smtp.us-east-1.amazonaws.com', port: 587, spfDoc: 'https://docs.aws.amazon.com/ses/latest/DeveloperGuide/spf.html' },
-  { provider: 'brevo-smtp', name: 'Brevo', host: 'smtp-relay.brevo.com', port: 587, spfDoc: 'https://help.brevo.com/hc/en-us/articles/12163873383186-Authenticate-your-domain-with-Brevo-Brevo-code-DKIM-DMARC' },
-  { provider: 'elasticemail-smtp', name: 'Elastic Email', host: 'smtp.elasticemail.com', port: 587, spfDoc: 'https://elasticemail.com/blog/marketing_tips/common-spf-errors' },
-  { provider: 'google-smtp', name: 'Google', host: 'smtp.gmail.com', port: 587, spfDoc: 'https://support.google.com/a/answer/33786?hl=en' },
-  { provider: 'mailgun-smtp', name: 'Mailgun', host: 'smtp.mailgun.org', port: 587, spfDoc: 'https://www.mailgun.com/blog/white-labeling-dns-records-your-customers-tips-tricks' },
-  { provider: 'mailjet-smtp', name: 'Mailjet', host: 'in-v3.mailjet.com', port: 587, spfDoc: 'https://app.mailjet.com/docs/spf-dkim-guide' },
-  { provider: 'office365-legacy-smtp', name: 'Office 365', host: 'smtp-legacy.office365.com', port: 587 }, // uses "login" AUTH instead of "plain"
-  { 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' },
-];
-
 const providerSpfDoc = computed(() => {
-  const tmp = providers.find(p => p.provider === provider.value);
+  const tmp = RELAY_PROVIDERS.find(p => p.provider === provider.value);
   return (tmp ? tmp.spfDoc : '') || '';
 });
 
@@ -79,7 +64,7 @@ function onProviderChange() {
   password.value = '';
 
   // prefill from preset
-  const tmp = providers.find(p => p.provider === provider.value);
+  const tmp = RELAY_PROVIDERS.find(p => p.provider === provider.value);
   if (!tmp) return;
 
   if (tmp.host) host.value = tmp.host;
@@ -150,6 +135,13 @@ async function onSubmit() {
   busy.value = false;
 }
 
+onMounted(async () => {
+  const [error, result] = await mailModel.config(props.domain);
+  if (error) return console.error(error);
+
+  provider.value = result.relay.provider;
+});
+
 </script>
 
 <template>
@@ -164,14 +156,14 @@ async function onSubmit() {
       @confirm="onSubmit()"
     >
       <div>
-        <SingleSelect v-model="provider" :options="providers" option-key="provider" option-label="name" @select="onProviderChange()" style="display: flex;"/>
+        <SingleSelect v-model="provider" :options="RELAY_PROVIDERS" option-key="provider" option-label="name" @select="onProviderChange()" style="display: flex;"/>
 
         <!-- set max-width here until Dialog supports that -->
         <div v-if="providerSpfDoc" class="text-warning" style="margin: 10px 0; max-width: 600px" v-html="$t('email.outbound.mailRelay.spfDocInfo', { name: provider, spfDocsLink: providerSpfDoc })"></div>
 
-        <div class="text-danger" style="margin: 10px 0;" v-if="provider === 'noop'">{{ $t(domain === adminDomain ? 'email.outbound.noopAdminDomainWarning' : 'email.outbound.noopNonAdminDomainWarning') }}</div>
+        <div class="error-label" style="margin: 10px 0;" v-if="provider === 'noop'">{{ $t(domain === adminDomain ? 'email.outbound.noopAdminDomainWarning' : 'email.outbound.noopNonAdminDomainWarning') }}</div>
 
-        <div class="text-danger" v-if="formError">{{ formError }}</div>
+        <div class="error-label" v-if="formError">{{ formError }}</div>
 
         <form ref="form" @submit.prevent="onSubmit()" autocomplete="off" @input="checkValidity()">
           <fieldset :disabled="busy" v-if="usesExternalServer(provider)">
@@ -214,9 +206,11 @@ async function onSubmit() {
     <SettingsItem>
       <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 v-html="$t('email.outbound.description')"></div>
+        <div>
+          <b>{{ prettyRelayProviderName(provider) }}</b> - <span v-html="$t('email.outbound.description')"></span>
+        </div>
       </FormGroup>
-      <div style="display: flex; align-items: center">
+      <div style="display: flex; align-items: center;">
         <Button tool plain @click="onShowDialog()">{{ $t('main.dialog.edit') }}</Button>
       </div>
     </SettingsItem>
diff --git a/dashboard/src/constants.js b/dashboard/src/constants.js
index 4675af200..478163e3f 100644
--- a/dashboard/src/constants.js
+++ b/dashboard/src/constants.js
@@ -317,6 +317,23 @@ const BACKUP_FORMATS = [
     { name: 'rsync', value: 'rsync' }
 ];
 
+const RELAY_PROVIDERS = [
+  { provider: 'cloudron-smtp', name: 'Built-in SMTP server' },
+  { provider: 'external-smtp', name: 'External SMTP server', host: '', port: 587 },
+  { provider: 'external-smtp-noauth', name: 'External SMTP server (No Authentication)', host: '', port: 587 },
+  { provider: 'ses-smtp', name: 'Amazon SES', host: 'email-smtp.us-east-1.amazonaws.com', port: 587, spfDoc: 'https://docs.aws.amazon.com/ses/latest/DeveloperGuide/spf.html' },
+  { provider: 'brevo-smtp', name: 'Brevo', host: 'smtp-relay.brevo.com', port: 587, spfDoc: 'https://help.brevo.com/hc/en-us/articles/12163873383186-Authenticate-your-domain-with-Brevo-Brevo-code-DKIM-DMARC' },
+  { provider: 'elasticemail-smtp', name: 'Elastic Email', host: 'smtp.elasticemail.com', port: 587, spfDoc: 'https://elasticemail.com/blog/marketing_tips/common-spf-errors' },
+  { provider: 'google-smtp', name: 'Google', host: 'smtp.gmail.com', port: 587, spfDoc: 'https://support.google.com/a/answer/33786?hl=en' },
+  { provider: 'mailgun-smtp', name: 'Mailgun', host: 'smtp.mailgun.org', port: 587, spfDoc: 'https://www.mailgun.com/blog/white-labeling-dns-records-your-customers-tips-tricks' },
+  { provider: 'mailjet-smtp', name: 'Mailjet', host: 'in-v3.mailjet.com', port: 587, spfDoc: 'https://app.mailjet.com/docs/spf-dkim-guide' },
+  { provider: 'office365-legacy-smtp', name: 'Office 365', host: 'smtp-legacy.office365.com', port: 587 }, // uses "login" AUTH instead of "plain"
+  { 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' },
+];
+
 // named exports
 export {
     API_ORIGIN,
@@ -346,6 +363,7 @@ export {
     REGIONS_HETZNER,
     REGIONS_WASABI,
     REGIONS_S3,
+    RELAY_PROVIDERS,
 };
 
 // default export
@@ -377,4 +395,5 @@ export default {
     REGIONS_HETZNER,
     REGIONS_WASABI,
     REGIONS_S3,
+    RELAY_PROVIDERS,
 };
diff --git a/dashboard/src/utils.js b/dashboard/src/utils.js
index 5fb3fc201..22114f112 100644
--- a/dashboard/src/utils.js
+++ b/dashboard/src/utils.js
@@ -1,6 +1,11 @@
 
 import { prettyBinarySize } from '@cloudron/pankow/utils';
-import { ISTATES, STORAGE_PROVIDERS } from './constants.js';
+import { RELAY_PROVIDERS, ISTATES, STORAGE_PROVIDERS } from './constants.js';
+
+function prettyRelayProviderName(provider) {
+  const tmp = RELAY_PROVIDERS.find(p => p.provider === provider);
+  return tmp ? tmp.name : provider;
+}
 
 // https://stackoverflow.com/questions/3665115/how-to-create-a-file-in-memory-for-user-to-download-but-not-through-server#18197341
 function download(filename, text) {
@@ -635,6 +640,7 @@ const cronHours = Array.from({ length: 24 }).map(function (v, i) { return { id:
 
 // named exports
 export {
+  prettyRelayProviderName,
   download,
   mountlike,
   s3like,
@@ -651,6 +657,7 @@ export {
 
 // default export
 export default {
+  prettyRelayProviderName,
   download,
   mountlike,
   s3like,