diff --git a/dns_editor.php b/dns_editor.php
index 46a57ce7..ca53b698 100644
--- a/dns_editor.php
+++ b/dns_editor.php
@@ -59,6 +59,8 @@ if ($action == 'add_record' && ! empty($_POST)) {
 
 	$record = strtolower($record);
 
+	// TODO regex validate record and content for invalid characters
+
 	if ($ttl <= 0) {
 		$ttl = 18000;
 	}
diff --git a/lib/functions/dns/function.createDomainZone.php b/lib/functions/dns/function.createDomainZone.php
index dd4e585b..86ffa75c 100644
--- a/lib/functions/dns/function.createDomainZone.php
+++ b/lib/functions/dns/function.createDomainZone.php
@@ -127,9 +127,9 @@ function createDomainZone($domain_id)
 						}
 					}
 				}
-				unset($required_entries['A']);
-				unset($required_entries['AAAA']);
 			}
+			unset($required_entries['A']);
+			unset($required_entries['AAAA']);
 		}
 
 		// NS records