diff --git a/dns_editor.php b/dns_editor.php
index b56bb4f1..9fbddf2e 100644
--- a/dns_editor.php
+++ b/dns_editor.php
@@ -18,7 +18,7 @@ if (! defined('AREA'))
  */
 
 // This file is being included in admin_domains and customer_domains
-	// and therefore does not need to require lib/init.php
+// and therefore does not need to require lib/init.php
 
 $domain_id = isset($_GET['domain_id']) ? (int) $_GET['domain_id'] : null;
 
@@ -29,10 +29,14 @@ $content = isset($_POST['record']['content']) ? trim($_POST['record']['content']
 $ttl = isset($_POST['record']['ttl']) ? (int) $_POST['record']['ttl'] : 18000;
 
 // get domain-name
-$dom_stmt = Database::prepare("SELECT domain FROM `" . TABLE_PANEL_DOMAINS . "` WHERE id = :did");
+$dom_stmt = Database::prepare("SELECT domain, isbinddomain FROM `" . TABLE_PANEL_DOMAINS . "` WHERE id = :did");
 $domain = Database::pexecute_first($dom_stmt, array(
 	'did' => $domain_id
 ));
+
+if ($domain['isbinddomain'] != '0') {
+	standard_error('dns_domain_nodns');
+}
 $domain = $idna_convert->decode($domain['domain']);
 
 // select all entries
@@ -67,7 +71,7 @@ if ($action == 'add_record' && ! empty($_POST)) {
 	if ($type == 'A' && filter_var($content, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false) {
 		$errors[] = $lng['error']['dns_arec_noipv4'];
 	} elseif ($type == 'AAAA' && filter_var($content, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) {
-		$errors[] = $lng['errors']['dns_aaaarec_noipv6'];
+		$errors[] = $lng['error']['dns_aaaarec_noipv6'];
 	} elseif ($type == 'MX') {
 		if ($prio === null || $prio < 0) {
 			$errors[] = $lng['error']['dns_mx_prioempty'];
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 83e7b232..976c0ae7 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1990,8 +1990,10 @@ $lng['extras']['path_protection_label'] = '<strong class="red">Important</strong
 $lng['extras']['path_protection_info'] = '<strong class="red">We strongly recommend protecting the given path, see "Extras" -> "Directory protection"</strong>';
 $lng['tasks']['backup_customerfiles'] = 'Backup job for customer %loginname%';
 
+$lng['error']['dns_domain_nodns'] = 'DNS is not enabled for this domain';
 $lng['error']['dns_content_empty'] = 'No content given';
 $lng['error']['dns_arec_noipv4'] = 'No valid IP address for A-record given';
+$lng['error']['dns_aaaarec_noipv6'] = 'No valid IP address for AAAA-record given';
 $lng['error']['dns_mx_prioempty'] = 'Invalid MX priority given';
 $lng['error']['dns_mx_needdom'] = 'The MX content value must be a valid domain-name';
 $lng['error']['dns_mx_noalias'] = 'The MX-content value cannot be an CNAME entry.';
diff --git a/templates/Sparkle/admin/domains/domains_edit.tpl b/templates/Sparkle/admin/domains/domains_edit.tpl
index fdd9b203..275b0077 100644
--- a/templates/Sparkle/admin/domains/domains_edit.tpl
+++ b/templates/Sparkle/admin/domains/domains_edit.tpl
@@ -4,7 +4,9 @@ $header
 			<h2>
 				<img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp;
 				{$title}
-				&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">edit DNS</a></small>)
+				<if $result['isbinddomain'] == '1'>
+					&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">edit DNS</a></small>)
+				</if>
 			</h2>
 		</header>