diff --git a/dashboard/src/views/EmailDomainView.vue b/dashboard/src/views/EmailDomainView.vue
index 4c6128d2e..3a50af989 100644
--- a/dashboard/src/views/EmailDomainView.vue
+++ b/dashboard/src/views/EmailDomainView.vue
@@ -29,6 +29,8 @@ const domain = ref('');
 const domainProvider = ref('');
 const mailConfig = ref({});
 const mailFqdn = ref('');
+const adminDomain = ref('');
+const adminDomainProvider = ref('');
 const incomingEnabled = ref(false);
 const enableIncomeBusy = ref(false);
 const enableIncomingSetupDns = ref(false);
@@ -98,7 +100,7 @@ async function onEnableIncoming() {
   const [error] = await mailModel.setEnabled(domain.value, true);
   if (error) return console.error(error);
 
-  // TODO this has to be done in the backend here! reconfigureEmailApps();
+  // FIXME this has to be done in the backend here! reconfigureEmailApps();
 
   if (enableIncomingSetupDns.value) {
     const [error] = await domainsModel.setDnsRecords({ domain: domain.value, type: 'mail' });
@@ -208,6 +210,11 @@ onMounted(async () => {
   if (error) return console.error(error);
 
   mailFqdn.value = result.mailFqdn;
+  adminDomain.value = result.adminDomain;
+
+  [error, result] = await domainsModel.get(result.adminDomain);
+  if (error) return console.error(error);
+  adminDomainProvider.value = result.provider;
 
   [error, result] = await domainsModel.list();
   if (error) return console.error(error);
@@ -250,7 +257,7 @@ onMounted(async () => {
     >
       <div>
         <p v-html="$t('email.enableEmailDialog.description', { domain: domain, requiredPortsDocsLink: 'https://docs.cloudron.io/email/#required-ports' })"></p>
-        <!-- TODO <p class="text-danger" v-if="adminDomain.provider === 'cloudflare'" v-html="$t('email.enableEmailDialog.cloudflareInfo', { adminDomain: config.adminDomain, mailFqdn: config.mailFqdn })"></p> -->
+        <p class="text-danger" v-if="adminDomainProvider === 'cloudflare'" v-html="$t('email.enableEmailDialog.cloudflareInfo', { adminDomain, mailFqdn })"></p>
         <div v-if="domainProvider === 'noop' || domainProvider === 'manual'" v-html="$t('email.enableEmailDialog.noProviderInfo')"></div>
         <div v-else>
           <Checkbox v-model="enableIncomingSetupDns" :label="$t('email.enableEmailDialog.setupDnsCheckbox')"/>