diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index 5cdbff6fa..5f04bb02b 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -109,7 +109,7 @@ abstract class TriggerOnObject extends Trigger
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>null, "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>"User,UserExternal,UserInternal,UserLDAP,UserLocal", "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values"=>null, "sql"=>"filter", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
index 480676c2a..01404f995 100644
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -382,9 +382,15 @@ class ValueSetEnumClasses extends ValueSetEnum
 	}
 
 	protected function LoadValues($aArgs)
-	{	
-		// First, get the additional values
+	{
+		// Call the parent to parse the additional values...
 		parent::LoadValues($aArgs);
+		
+		// Translate the labels of the additional values
+		foreach($this->m_aValues as $sClass => $void)
+		{
+			$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+		}
 
 		// Then, add the classes from the category definition
 		foreach (MetaModel::GetClasses($this->m_sCategories) as $sClass)
diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php
index 456fe79d0..4a796d7a9 100644
--- a/dictionaries/dictionary.itop.ui.php
+++ b/dictionaries/dictionary.itop.ui.php
@@ -134,6 +134,9 @@ Dict::Add('EN US', 'English', 'English', array(
 
 	'Class:User/Error:LoginMustBeUnique' => 'Login must be unique - "%1s" is already being used.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'At least one profile must be assigned to this user.',
+
+	'Class:UserInternal' => 'User Internal',
+	'Class:UserInternal+' => 'User defined within iTop',
 ));
 
 //
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 1a749d686..9aa82f0a2 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -158,6 +158,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:User/Attribute:allowed_org_list+' => 'L\'utilisateur a le droit de voir les données des organisations listées ici. Si aucune organisation n\'est spécifiée, alors aucune restriction ne s\'applique.',
 	'Class:User/Error:LoginMustBeUnique' => 'Le login doit être unique - "%1s" est déjà utilisé.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'L\'utilisateur doit avoir au moins un profil.',
+	'Class:UserInternal' => 'Utilisateur interne',
+	'Class:UserInternal+' => 'Utilisateur défini dans iTop',
 	'Class:URP_Dimensions' => 'Dimension',
 	'Class:URP_Dimensions+' => 'Dimension applicative (défini des silos)',
 	'Class:URP_Dimensions/Attribute:name' => 'Nom',