diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc
index 178e1688..531b05d4 100644
--- a/lam/lib/modules/ieee802device.inc
+++ b/lam/lib/modules/ieee802device.inc
@@ -94,18 +94,18 @@ class ieee802Device extends baseModule {
 		// list current MACs
 		for ($i = 0; $i < sizeof($this->attributes['macAddress']); $i++) {
 			$return[] = array(
-				0 => array('kind' => 'text', 'text' => _('MAC address')),
-				1 => array('kind' => 'input', 'name' => 'macAddress' . $i, 'type' => 'text', 'size' => '17', 'maxlength' => '17', 'value' => $this->attributes['macAddress'][$i]),
-				2 => array('kind' => 'input', 'type' => 'submit', 'name' => 'delMAC' . $i, 'value' => _("Remove")),
-				3 => array('kind' => 'help', 'value' => 'mac'));
+				array('kind' => 'text', 'text' => _('MAC address')),
+				array('kind' => 'input', 'name' => 'macAddress' . $i, 'type' => 'text', 'size' => '17', 'maxlength' => '17', 'value' => $this->attributes['macAddress'][$i]),
+				array('kind' => 'input', 'type' => 'submit', 'name' => 'delMAC' . $i, 'value' => _("Remove")),
+				array('kind' => 'help', 'value' => 'mac'));
 		}
 		// input box for new MAC
 		$return[] = array(
-			0 => array('kind' => 'text', 'text' => _('New MAC address')),
-			1 => array('kind' => 'input', 'name' => 'macAddress', 'type' => 'text', 'size' => '17', 'maxlength' => '17', 'value' => ''),
-			2 => array('kind' => 'input', 'type' => 'submit', 'name' => 'addMAC', 'value' => _("Add")),
-			3 => array('kind' => 'help', 'value' => 'mac'),
-			4 => array('kind' => 'input', 'type' => 'hidden', 'value' => sizeof($this->attributes['macAddress']), 'name' => 'mac_number'));
+			array('kind' => 'text', 'text' => _('New MAC address')),
+			array('kind' => 'input', 'name' => 'macAddress', 'type' => 'text', 'size' => '17', 'maxlength' => '17', 'value' => ''),
+			array('kind' => 'input', 'type' => 'submit', 'name' => 'addMAC', 'value' => _("Add")),
+			array('kind' => 'help', 'value' => 'mac'),
+			array('kind' => 'input', 'type' => 'hidden', 'value' => sizeof($this->attributes['macAddress']), 'name' => 'mac_number'));
 		return $return;
 	}
 
diff --git a/lam/lib/modules/inetLocalMailRecipient.inc b/lam/lib/modules/inetLocalMailRecipient.inc
index d546f833..7be1fc61 100644
--- a/lam/lib/modules/inetLocalMailRecipient.inc
+++ b/lam/lib/modules/inetLocalMailRecipient.inc
@@ -134,33 +134,33 @@ class inetLocalMailRecipient extends baseModule {
 		$routingAddress = '';
 		if (isset($this->attributes['mailRoutingAddress'][0])) $routingAddress = $this->attributes['mailRoutingAddress'][0];
 		$return[] = array(
-			0 => array('kind' => 'text', 'text' => _('Routing address')),
-			1 => array('kind' => 'input', 'name' => 'routingAdr', 'type' => 'text', 'size' => '20', 'value' => $routingAddress),
-			2 => array('kind' => 'help', 'value' => 'routingAdr'));
+			array('kind' => 'text', 'text' => _('Routing address')),
+			array('kind' => 'input', 'name' => 'routingAdr', 'type' => 'text', 'size' => '20', 'value' => $routingAddress),
+			array('kind' => 'help', 'value' => 'routingAdr'));
 		// mail server
 		$mailServer = '';
 		if (isset($this->attributes['mailHost'][0])) $mailServer = $this->attributes['mailHost'][0];
 		$return[] = array(
-			0 => array('kind' => 'text', 'text' => _('Mail server')),
-			1 => array('kind' => 'input', 'name' => 'host', 'type' => 'text', 'size' => '20', 'value' => $mailServer),
-			2 => array('kind' => 'help', 'value' => 'host'));
+			array('kind' => 'text', 'text' => _('Mail server')),
+			array('kind' => 'input', 'name' => 'host', 'type' => 'text', 'size' => '20', 'value' => $mailServer),
+			array('kind' => 'help', 'value' => 'host'));
 		// list current local addresses
 		$localAdresses = array();
 		if (isset($this->attributes['mailLocalAddress'])) $localAdresses = $this->attributes['mailLocalAddress'];
 		for ($i = 0; $i < sizeof($localAdresses); $i++) {
 			$return[] = array(
-				0 => array('kind' => 'text', 'text' => _('Local address')),
-				1 => array('kind' => 'input', 'name' => 'localAdr' . $i, 'type' => 'text', 'size' => '20', 'value' => $localAdresses[$i]),
-				2 => array('kind' => 'input', 'type' => 'submit', 'name' => 'delAdr' . $i, 'value' => _("Remove")),
-				3 => array('kind' => 'help', 'value' => 'localAdr'));
+				array('kind' => 'text', 'text' => _('Local address')),
+				array('kind' => 'input', 'name' => 'localAdr' . $i, 'type' => 'text', 'size' => '20', 'value' => $localAdresses[$i]),
+				array('kind' => 'input', 'type' => 'submit', 'name' => 'delAdr' . $i, 'value' => _("Remove")),
+				array('kind' => 'help', 'value' => 'localAdr'));
 		}
 		// input box for new local addresses
 		$return[] = array(
-			0 => array('kind' => 'text', 'text' => _('New local address')),
-			1 => array('kind' => 'input', 'name' => 'localAdr', 'type' => 'text', 'size' => '20', 'value' => ''),
-			2 => array('kind' => 'input', 'type' => 'submit', 'name' => 'addAdr', 'value' => _("Add")),
-			3 => array('kind' => 'help', 'value' => 'localAdr'),
-			4 => array('kind' => 'input', 'type' => 'hidden', 'value' => sizeof($localAdresses), 'name' => 'adr_number'));
+			array('kind' => 'text', 'text' => _('New local address')),
+			array('kind' => 'input', 'name' => 'localAdr', 'type' => 'text', 'size' => '20', 'value' => ''),
+			array('kind' => 'input', 'type' => 'submit', 'name' => 'addAdr', 'value' => _("Add")),
+			array('kind' => 'help', 'value' => 'localAdr'),
+			array('kind' => 'input', 'type' => 'hidden', 'value' => sizeof($localAdresses), 'name' => 'adr_number'));
 		return $return;
 	}
 
diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc
index 9ed2cf8b..5efb9b56 100644
--- a/lam/lib/modules/ldapPublicKey.inc
+++ b/lam/lib/modules/ldapPublicKey.inc
@@ -87,18 +87,18 @@ class ldapPublicKey extends baseModule {
 		// list current keys
 		for ($i = 0; $i < sizeof($this->attributes['sshPublicKey']); $i++) {
 			$return[] = array(
-				0 => array('kind' => 'text', 'text' => _('SSH public key')),
-				1 => array('kind' => 'input', 'name' => 'sshPublicKey' . $i, 'type' => 'text', 'size' => '50', 'maxlength' => '2048', 'value' => $this->attributes['sshPublicKey'][$i]),
-				2 => array('kind' => 'input', 'type' => 'submit', 'name' => 'delKey' . $i, 'value' => _("Remove")),
-				3 => array('kind' => 'help', 'value' => 'key'));
+				array('kind' => 'text', 'text' => _('SSH public key')),
+				array('kind' => 'input', 'name' => 'sshPublicKey' . $i, 'type' => 'text', 'size' => '50', 'maxlength' => '2048', 'value' => $this->attributes['sshPublicKey'][$i]),
+				array('kind' => 'input', 'type' => 'submit', 'name' => 'delKey' . $i, 'value' => _("Remove")),
+				array('kind' => 'help', 'value' => 'key'));
 		}
 		// input box for new key
 		$return[] = array(
-			0 => array('kind' => 'text', 'text' => _('New SSH public key')),
-			1 => array('kind' => 'input', 'name' => 'sshPublicKey', 'type' => 'text', 'size' => '50', 'maxlength' => '2048', 'value' => ''),
-			2 => array('kind' => 'input', 'type' => 'submit', 'name' => 'addKey', 'value' => _("Add")),
-			3 => array('kind' => 'help', 'value' => 'key'),
-			4 => array('kind' => 'input', 'type' => 'hidden', 'value' => sizeof($this->attributes['sshPublicKey']), 'name' => 'key_number'));
+			array('kind' => 'text', 'text' => _('New SSH public key')),
+			array('kind' => 'input', 'name' => 'sshPublicKey', 'type' => 'text', 'size' => '50', 'maxlength' => '2048', 'value' => ''),
+			array('kind' => 'input', 'type' => 'submit', 'name' => 'addKey', 'value' => _("Add")),
+			array('kind' => 'help', 'value' => 'key'),
+			array('kind' => 'input', 'type' => 'hidden', 'value' => sizeof($this->attributes['sshPublicKey']), 'name' => 'key_number'));
 		return $return;
 	}