diff --git a/inc/inc.ClassGroup.php b/inc/inc.ClassGroup.php
index 17e7543ad..c1f338986 100644
--- a/inc/inc.ClassGroup.php
+++ b/inc/inc.ClassGroup.php
@@ -161,14 +161,16 @@ class LetoDMS_Group {
 	} /* }}} */
 
 	/**
-	 * Entfernt die Gruppe aus dem System.
-	 * Dies ist jedoch nicht mit einem Löschen des entsprechenden Eintrags aus tblGroups geschehen - vielmehr
-	 * muss dafür gesorgt werden, dass die Gruppe nirgendwo mehr auftaucht. D.h. auch die Tabellen tblACLs,
-	 * tblNotify und tblGroupMembers müssen berücksichtigt werden.
+	 * Delete user group
+	 * This function deletes the user group and all it references, like access
+	 * control lists, notifications, as a child of other groups, etc.
+	 *
+	 * @param object $user the user doing the removal (needed for entry in
+	 *        review log.
+	 * @return boolean true on success or false in case of an error
 	 */
-	function remove() { /* {{{ */
+	function remove($user) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$user = $this->_dms->user;
 
 		$queryStr = "DELETE FROM tblGroups WHERE id = " . $this->_id;
 		if (!$db->getResult($queryStr))
diff --git a/inc/inc.ClassUser.php b/inc/inc.ClassUser.php
index 0ffc52bfe..e3071928b 100644
--- a/inc/inc.ClassUser.php
+++ b/inc/inc.ClassUser.php
@@ -284,13 +284,14 @@ class LetoDMS_User {
 	 * Do not remove folders and documents of the user, but assign them
 	 * to a different user.
 	 *
+	 * @param object $user the user doing the removal (needed for entry in
+	 *        review log.
 	 * @param object $assignToUser the user who is new owner of folders and
 	 *        documents which previously were owned by the delete user.
 	 * @return boolean true on success or false in case of an error
 	 */
-	function remove( $assignToUser=null ) { /* {{{ */
+	function remove($user, $assignToUser=null) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$user = $this->_dms->user;
 
 		/* Records like folders and documents that formely have belonged to
 		 * the user will assign to another user. If no such user is set,
diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php
index d16e8f08f..350242052 100644
--- a/op/op.GroupMgr.php
+++ b/op/op.GroupMgr.php
@@ -67,7 +67,7 @@ else if ($action == "removegroup") {
 		UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
 	}
 
-	if (!$group->remove()) {
+	if (!$group->remove($user)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
 	
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 0aca9e1ab..e45dfb901 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -123,7 +123,7 @@ else if ($action == "removeuser") {
 	}
 
 	$userToAssign = $dms->getUser($_POST["assignTo"]);
-	if (!$userToRemove->remove($userToAssign)) {
+	if (!$userToRemove->remove($user, $userToAssign)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}