diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
index 62fe917..1177ab6 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
@@ -36,24 +36,20 @@ KTUtil::extractGPC('fAssign', 'fUserID', 'fUserSet', 'groupAddedLeft', 'groupAdd
  */
 function updateGroups($iUserID, $aToAddIDs, $aToRemoveIDs) {
 
-	// Add groups
+    $oUser = User::get($iUserID);
+
 	foreach ($aToAddIDs as $iGroupID ) {
 		if ($iGroupID > 0) {
-			$oUserGroup = new GroupUserLink($iGroupID, $iUserID);
-			if (!$oUserGroup->create()) {
-           		return false;
-       		}
+            $oGroup = Group::get($iGroupID);
+            $oGroup->addMember($oUser);
 		}
 	}
 
 	// Remove groups
 	foreach ($aToRemoveIDs as $iGroupID ) {
 		if ($iGroupID > 0) {
-			$oUserGroup = new GroupUserLink($iGroupID, $iUserID);
-			$oUserGroup->setUserGroupID($iGroupID,$iUserID);
-        	if(!$oUserGroup->delete()) {
-	            return false;
-   		    }
+            $oGroup = Group::get($iGroupID);
+            $oGroup->removeMember($oUser);
 		}
 	}