diff --git a/src/etc/config.xml.sample b/src/etc/config.xml.sample
index 4bbad325a..fcb631447 100644
--- a/src/etc/config.xml.sample
+++ b/src/etc/config.xml.sample
@@ -270,7 +270,6 @@
   </dhcpd>
   <unbound>
     <enable>1</enable>
-    <dnssec>1</dnssec>
   </unbound>
   <snmpd>
     <syslocation/>
diff --git a/src/wizard/system.xml b/src/wizard/system.xml
index 00e59bb12..f99ec92fc 100644
--- a/src/wizard/system.xml
+++ b/src/wizard/system.xml
@@ -59,6 +59,10 @@ if (isset($config['wizardtemp'])) {
 	<id>2</id>
 	<title>General Information</title>
 	<fields>
+		<field>
+			<name>General Information</name>
+			<type>listtopic</type>
+		</field>
 		<field>
 			<name>Hostname</name>
 			<type>input</type>
@@ -102,6 +106,26 @@ if (isset($config['wizardtemp'])) {
 			<type>checkbox</type>
 			<bindstofield>system->dnsallowoverride</bindstofield>
 		</field>
+		<field>
+			<name>Unbound DNS</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<name>Enable Resolver</name>
+			<type>checkbox</type>
+			<value>1</value>
+			<bindstofield>unbound->enable</bindstofield>
+		</field>
+		<field>
+			<name>Enable DNSSEC Support</name>
+			<type>checkbox</type>
+			<bindstofield>unbound->dnssec</bindstofield>
+		</field>
+		<field>
+			<name>Harden DNSSEC data</name>
+			<type>checkbox</type>
+			<bindstofield>unbound->dnssecstripped</bindstofield>
+		</field>
 		<field>
 			<name>Next</name>
 			<type>submit</type>
@@ -129,6 +153,10 @@ if (!empty($_POST['secondarydnsserver']) && !is_ipaddr($_POST['secondarydnsserve
 }
 if (count($input_errors)) {
 	$stepid--;
+} else {
+	if (isset($config['unbound']['forwarding'])) {
+		unset($config['unbound']['forwarding']);
+	}
 }
 	]]></stepsubmitphpaction>
 </step>
diff --git a/src/www/wizard.php b/src/www/wizard.php
index 3fe4aefc3..959b4af12 100644
--- a/src/www/wizard.php
+++ b/src/www/wizard.php
@@ -736,7 +736,7 @@ function showchange() {
 
 				break;
 			case "listtopic":
-				echo "<td colspan=\"2\" class=\"listtopic\">" . gettext($field['name']) . "<br />\n";
+				echo "<td colspan=\"2\" class=\"listtopic\"><strong>" . gettext($field['name']) . "</strong>\n";
 
 				break;
 			case "subnet_select":