diff --git a/entities/trunk/class/class_users_entities.php b/entities/trunk/class/class_users_entities.php
index 31724fe953da38cd432783ee62d61ece6e7baff8..aad5a3a54f444c8b6fe37ac37b47a9594efd5a95 100644
--- a/entities/trunk/class/class_users_entities.php
+++ b/entities/trunk/class/class_users_entities.php
@@ -24,9 +24,9 @@ class users_entities extends dbquery
 
 		if($mode == 'up')
 		{
-			if (($_SESSION['m_admin']['load_entities'] == true || ! isset($_SESSION['m_admin']['load_entities'] )) && $_SESSION['m_admin']['users']['UserId'] <> "superadmin")
+			if (($_SESSION['m_admin']['load_entities'] == true || ! isset($_SESSION['m_admin']['load_entities'] )) && $_SESSION['m_admin']['users']['user_id'] <> "superadmin")
 			{
-				$this->load_entities_session($_SESSION['m_admin']['users']['UserId']);
+				$this->load_entities_session($_SESSION['m_admin']['users']['user_id']);
 			}
 		}
 		else
@@ -285,7 +285,7 @@ class users_entities extends dbquery
 
 		if(!$from_module_entities_page)
 		{
-			$this->query("DELETE FROM ".$_SESSION['tablename']['ent_users_entities'] ." where user_id = '".$this->protect_string_db(trim($_SESSION['m_admin']['users']['UserId']))."'");
+			$this->query("DELETE FROM ".$_SESSION['tablename']['ent_users_entities'] ." where user_id = '".$this->protect_string_db(trim($_SESSION['m_admin']['users']['user_id']))."'");
 		}
 		else
 		{
@@ -296,7 +296,7 @@ class users_entities extends dbquery
 			$tmp_r = $this->protect_string_db($_SESSION['m_admin']['entity']['entities'][$i]['ROLE']);
 			if(!$from_module_entities_page)
 			{
-				$this->query("INSERT INTO ".$_SESSION['tablename']['ent_users_entities']." VALUES ('".$_SESSION['m_admin']['users']['UserId']."', '".$_SESSION['m_admin']['entity']['entities'][$i]['ENTITY_ID']."', '".$tmp_r."', '".$_SESSION['m_admin']['entity']['entities'][$i]['PRIMARY']."')");
+				$this->query("INSERT INTO ".$_SESSION['tablename']['ent_users_entities']." VALUES ('".$_SESSION['m_admin']['users']['user_id']."', '".$_SESSION['m_admin']['entity']['entities'][$i]['ENTITY_ID']."', '".$tmp_r."', '".$_SESSION['m_admin']['entity']['entities'][$i]['PRIMARY']."')");
 			}
 			else
 			{
diff --git a/entities/trunk/remove_user_entities.php b/entities/trunk/remove_user_entities.php
index cfb1b94ad3e2d5f536aa07461e81cc74c976187c..5be68f6d5e56b45ae1f7a43fdeadccab21401d29 100644
--- a/entities/trunk/remove_user_entities.php
+++ b/entities/trunk/remove_user_entities.php
@@ -20,7 +20,7 @@ if(isset($_REQUEST['entities']) && $_REQUEST['entities'] >= 0)
 	{
 		unset($_SESSION['m_admin']['entity']['entities'][$to_unset[$i]]);
 	}
-	array_unique($_SESSION['m_admin']['entity']['entities']);
+	$_SESSION['m_admin']['entity']['entities'] = array_values($_SESSION['m_admin']['entity']['entities']);
 	$_SESSION['m_admin']['load_entities'] = false;
 	echo "{ status : 0 }";
 }
diff --git a/entities/trunk/service_user_entities.php b/entities/trunk/service_user_entities.php
index c2c09b71448060e82bea743946e47bc8dbface11..0312c66321ed6b544734f930f249239624767175 100644
--- a/entities/trunk/service_user_entities.php
+++ b/entities/trunk/service_user_entities.php
@@ -1,11 +1,10 @@
 <?php
 require_once('modules/entities/class/EntityControler.php');
-
 if($_SESSION['service_tag'] == 'user_init')
 {
 	$_SESSION['m_admin']['nbentities'] = EntityControler::getEntitiesCount();
 	
-	$tmp_array = EntityControler::getUsersEntities($_SESSION['m_admin']['users']['UserId']);
+	$tmp_array = EntityControler::getUsersEntities($_SESSION['m_admin']['users']['user_id']);
 	for($i=0; $i<count($tmp_array);$i++)
 	{
 		$ent = EntityControler::get($tmp_array[$i]['ENTITY_ID']);
@@ -50,9 +49,9 @@ elseif($_SESSION['service_tag'] == 'user_check')
 		}
 	}
 }
-elseif($_SESSION['service_tag'] == 'user_add_' || $_SESSION['service_tag'] == 'user_up')
+elseif($_SESSION['service_tag'] == 'user_add' || $_SESSION['service_tag'] == 'user_up')
 {
-	EntityControler::cleanUsersentities($_SESSION['m_admin']['users']['UserId'], 'user_id');
-	EntityControler::loadDbUsersentities($_SESSION['m_admin']['users']['UserId'], $_SESSION['m_admin']['entity']['entities']);
+	EntityControler::cleanUsersentities($_SESSION['m_admin']['users']['user_id'], 'user_id');
+	EntityControler::loadDbUsersentities($_SESSION['m_admin']['users']['user_id'], $_SESSION['m_admin']['entity']['entities']);
 }
 ?>
diff --git a/entities/trunk/xml/services.xml b/entities/trunk/xml/services.xml
index 32a4cb76d9b05d4dea293c6a8a4cfe6ea20428f2..3d1600c1356a95b1492bf1d6ecc1d15d82303ae5 100644
--- a/entities/trunk/xml/services.xml
+++ b/entities/trunk/xml/services.xml
@@ -152,7 +152,7 @@
 			<nature>include</nature>
 		</WHEREAMIUSED>
 		<WHEREAMIUSED>
-			<page>users_add_db.php</page>
+			<page>users_add_db</page>
 			<nature>include</nature>
 		</WHEREAMIUSED>
 	</SERVICE>