diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index 008c5283..8a8b09a0 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -401,6 +401,15 @@ class inetOrgPerson extends baseModule {
 				unset($return[$_SESSION[$this->base]->dn]['add']['userPassword']);
 			}
 		}
+		// postalAddress and facsimileTelephoneNumber need special removing
+		if (isset($return[$_SESSION[$this->base]->dn]['remove']['postalAddress'])) {
+			$return[$_SESSION[$this->base]->dn]['modify']['postalAddress'] = array();
+			unset($return[$_SESSION[$this->base]->dn]['remove']['postalAddress']);
+		}
+		if (isset($return[$_SESSION[$this->base]->dn]['remove']['facsimileTelephoneNumber'])) {
+			$return[$_SESSION[$this->base]->dn]['modify']['facsimileTelephoneNumber'] = array();
+			unset($return[$_SESSION[$this->base]->dn]['remove']['facsimileTelephoneNumber']);
+		}
 		return $return;
 	}