diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index ab17c124..5f3be9dd 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -133,6 +133,9 @@ class inetOrgPerson extends baseModule implements passwordService {
 			'location', 'state', 'officeName', 'businessCategory', 'departmentNumber', 'initials', 'title', 'labeledURI');
 		// profile elements
 		$profileElements = array();
+		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideInitials')) {
+			$profileElements[] = new htmlTableExtendedInputField(_('Initials'), 'inetOrgPerson_initials', null, 'initials');
+		}
 		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideStreet')) {
 			$profileElements[] = new htmlTableExtendedInputField(_('Street'), 'inetOrgPerson_street', null, 'streetList');
 		}
@@ -154,6 +157,12 @@ class inetOrgPerson extends baseModule implements passwordService {
 		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideRegisteredAddress')) {
 			$profileElements[] = new htmlTableExtendedInputField(_('Registered address'), 'inetOrgPerson_registeredAddress', null, 'registeredAddress');
 		}
+		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideOfficeName')) {
+			$profileElements[] = new htmlTableExtendedInputField(_('Office name'), 'inetOrgPerson_physicalDeliveryOfficeName', null, 'physicalDeliveryOfficeName');
+		}
+		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideRoomNumber')) {
+			$profileElements[] = new htmlTableExtendedInputField(_('Room number'), 'inetOrgPerson_roomNumber', null, 'roomNumber');
+		}
 		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideTelephoneNumber')) {
 			$profileElements[] = new htmlTableExtendedInputField(_('Telephone number'), 'inetOrgPerson_telephoneNumber', null, 'telephoneNumberList');
 		}
@@ -187,6 +196,9 @@ class inetOrgPerson extends baseModule implements passwordService {
 			$return['profile_options'] = $profileContainer;
 		}
 		// profile checks and mappings
+		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideInitials')) {
+			$return['profile_mappings']['inetOrgPerson_initials'] = 'initials';
+		}
 		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideJobTitle')) {
 			$return['profile_checks']['inetOrgPerson_title'] = array(
 				'type' => 'ext_preg',
@@ -227,6 +239,12 @@ class inetOrgPerson extends baseModule implements passwordService {
 				'error_message' => $this->messages['registeredAddress'][0]);
 			$return['profile_mappings']['inetOrgPerson_registeredAddress'] = 'registeredAddress';
 		}
+		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideOfficeName')) {
+			$return['profile_mappings']['inetOrgPerson_physicalDeliveryOfficeName'] = 'physicalDeliveryOfficeName';
+		}
+		if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideRoomNumber')) {
+			$return['profile_mappings']['inetOrgPerson_roomNumber'] = 'roomNumber';
+		}
 		// configuration settings
 		$configContainer = new htmlTable();
 		$configContainerHead = new htmlTable();