diff --git a/lib/logic/models/json/dns_providers/cloudflare_dns_adapter.dart b/lib/logic/models/json/dns_providers/cloudflare_dns_adapter.dart
index 622e7129..dafe51d4 100644
--- a/lib/logic/models/json/dns_providers/cloudflare_dns_adapter.dart
+++ b/lib/logic/models/json/dns_providers/cloudflare_dns_adapter.dart
@@ -5,7 +5,7 @@ CloudflareDnsRecord _fromDnsRecord(
   final String rootDomain,
 ) {
   String name = dnsRecord.name ?? '';
-  if (name != rootDomain) {
+  if (name != rootDomain && name != '@') {
     name = '$name.$rootDomain';
   }
   return CloudflareDnsRecord(
diff --git a/lib/logic/providers/dns_providers/cloudflare.dart b/lib/logic/providers/dns_providers/cloudflare.dart
index a3238aed..b1f37804 100644
--- a/lib/logic/providers/dns_providers/cloudflare.dart
+++ b/lib/logic/providers/dns_providers/cloudflare.dart
@@ -255,7 +255,7 @@ class CloudflareDnsProvider extends DnsProvider {
               type: record.type,
               category: record.type == 'A'
                   ? DnsRecordsCategory.services
-                  : DnsRecordsCategory.other,
+                  : DnsRecordsCategory.email,
             ),
           );
         }