diff --git a/scripts/register-domains.js b/scripts/register-domains.js
index f9e81796f..370949af6 100644
--- a/scripts/register-domains.js
+++ b/scripts/register-domains.js
@@ -15,25 +15,23 @@ const toHostList = R.chain(data => {
   // URL redirection must contain explicit A record
   // Wildcard A record breaks when used with MX
   // Ref: https://github.com/is-a-dev/register/issues/2365
-  if (data.record.URL) {
+  if (data.record.URL && data.record.MX) {
     data.record.A = [ DOMAIN_HOST_IP ]
   }
 
-  return R.pipe(
-    data.record,
-    getRecords,
-    R.chain(([recordType, values]) => {
-      const valueList = Array.isArray(values) ? values : [values];
+  const records = getRecords(data.record);
 
-      return valueList.map((value, index) => ({
-        name: data.name,
-        type: recordType,
-        address: address(recordType, value),
-        ttl: TTL,
-        ...(recordType === 'MX' ? { priority: index + 20 } : {})
-      }))
-    }),
-  );
+  return R.chain(([recordType, values]) => {
+    const valueList = Array.isArray(values) ? values : [values];
+
+    return valueList.map((value, index) => ({
+      name: data.name,
+      type: recordType,
+      address: address(recordType, value),
+      ttl: TTL,
+      ...(recordType === 'MX' ? { priority: index + 20 } : {})
+    }))
+  }, records)
 });
 
 const registerDomains = async ({ domainService, getDomains, log = () => { } }) => {
diff --git a/utils/domain-service.js b/utils/domain-service.js
index 3732712de..7829e7431 100644
--- a/utils/domain-service.js
+++ b/utils/domain-service.js
@@ -95,7 +95,7 @@ const getDomainService = ({ cpanel }) => {
       cpanel.zone.add
     ),
     recordToZone,
-    print(({ name }) => `Adding zone for ${name}...`),
+    print(r => `Adding zone for ${r.name}: (${r.type} ${r.address})...`),
   ));
   const removeZoneRecord = lazyTask(R.compose(
     R.ifElse(R.propEq('type', 'MX'),
@@ -103,7 +103,7 @@ const getDomainService = ({ cpanel }) => {
       R.compose(cpanel.zone.remove, R.pick(['line']))
     ),
     recordToZone,
-    print(({ name }) => `Deleting zone for ${name}...`),
+    print(r => `Deleting zone for ${r.name}: (${r.type} ${r.address})...`),
   ));
   const addRedirection = lazyTask(R.compose(
     cpanel.redirection.add,