diff --git a/lam/lib/modules/ddns.inc b/lam/lib/modules/ddns.inc
index ed776ed1..6c5b7313 100644
--- a/lam/lib/modules/ddns.inc
+++ b/lam/lib/modules/ddns.inc
@@ -59,7 +59,7 @@ class ddns extends baseModule {
 		// managed object classes
 		$return['objectClasses'] = array();
 		// managed attributes
-		$return['attributes'] = array();
+		$return['attributes'] = array('dhcpOption', 'dhcpStatements');
 		// help Entries
 		$return['help'] = array(
 				'active' => array(
diff --git a/lam/lib/modules/dhcp_settings.inc b/lam/lib/modules/dhcp_settings.inc
index 7605df4b..00441761 100644
--- a/lam/lib/modules/dhcp_settings.inc
+++ b/lam/lib/modules/dhcp_settings.inc
@@ -122,7 +122,7 @@ class dhcp_settings extends baseModule {
 		// managed object classes
 		$return['objectClasses'] = array('top', 'dhcpOptions');
 		// managed attributes
-		$return['attributes'] = array('cn');
+		$return['attributes'] = array('cn', 'dhcpOption');
 		// help Entries
 		$return['help'] = array(
 				'domainname' => array(
@@ -252,7 +252,9 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
 	public function save_attributes() {
 		if ($_SESSION['account']->getAccountModule('dhcp_settings')->dn!=$_SESSION['config']->get_suffix('dhcp')) {
 			// Standard Things
-			$this->attributes['objectClass'][2] = "dhcpSubnet";
+			if (!in_array_ignore_case("dhcpSubnet", $this->attributes['objectClass'])) {
+				$this->attributes['objectClass'][] = "dhcpSubnet";
+			}
 			// sort to array:
 			if (is_array($this->attributes['dhcpOption'])) {
 				$i = 0;
diff --git a/lam/lib/modules/fixed_ip.inc b/lam/lib/modules/fixed_ip.inc
index ac6fdabb..488d6b5c 100644
--- a/lam/lib/modules/fixed_ip.inc
+++ b/lam/lib/modules/fixed_ip.inc
@@ -70,7 +70,7 @@ class fixed_ip extends baseModule {
 		// managed object classes
 		$return['objectClasses'] = array();
 		// managed attributes
-		$return['attributes'] = array();
+		$return['attributes'] = array('dhcpOption');
 		// help Entries
 		$return['help'] = array(
 				'pc' => array(
diff --git a/lam/lib/modules/range.inc b/lam/lib/modules/range.inc
index 458c2b3f..fbde7714 100644
--- a/lam/lib/modules/range.inc
+++ b/lam/lib/modules/range.inc
@@ -71,7 +71,7 @@ class range extends baseModule {
 		// managed object classes
 		$return['objectClasses'] = array();
 		// managed attributes
-		$return['attributes'] = array();
+		$return['attributes'] = array('dhcpOption');
 		// help Entries
 		$return['help'] = array(
 				'range_from' => array(