diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 61d4efe68b0..6a0ca1db656 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1368,7 +1368,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1376,13 +1376,13 @@ else
                 }
                 else
                 {
-                    print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
+                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
 
             // Si on a un gestionnaire de generation de mot de passe actif
@@ -1393,9 +1393,9 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
-                    print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
                 }
 
 				if ($object->statut == 0)
@@ -1403,32 +1403,32 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
-                    if ($object->email) print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
+                    if ($object->email) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
                     else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
                 }
             }
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
+                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butActionDelete" href="fiche.php?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
+                print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{
-                	print '<a class="butActionDelete" href="fiche.php?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a>';
+                	print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a>';
             	}
             	else
             	{
@@ -1582,7 +1582,7 @@ else
             print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
             print '<table width="100%" class="border">';
 
             $rowspan=13;
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 0a624a67fa5..dfb235354c3 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -28,6 +28,7 @@ require_once("../master.inc.php");
 require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
 require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
 dol_syslog("Call Contact webservices interfaces");
@@ -80,6 +81,58 @@ $server->wsdl->addComplexType(
     )
 );
 
+$contact_fields = array(
+	'id' => array('name'=>'id','type'=>'xsd:string'),
+	'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
+	'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
+	'address' => array('name'=>'address','type'=>'xsd:string'),
+	'zip' => array('name'=>'zip','type'=>'xsd:string'),
+	'town' => array('name'=>'town','type'=>'xsd:string'),
+	'state_id' => array('name'=>'state_id','type'=>'xsd:string'),
+	'state_code' => array('name'=>'state_code','type'=>'xsd:string'),
+	'state' => array('name'=>'state','type'=>'xsd:string'),
+	'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
+	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
+	'country' => array('name'=>'country','type'=>'xsd:string'),
+	'socid' => array('name'=>'socid','type'=>'xsd:string'),
+	'status' => array('name'=>'status','type'=>'xsd:string'),
+	'phone_pro' => array('name'=>'phone_pro','type'=>'xsd:string'),
+	'fax' => array('name'=>'fax','type'=>'xsd:string'),
+	'phone_perso' => array('name'=>'phone_perso','type'=>'xsd:string'),
+	'phone_mobile' => array('name'=>'phone_mobile','type'=>'xsd:string'),
+	'code' => array('name'=>'code','type'=>'xsd:string'),
+	'email' => array('name'=>'email','type'=>'xsd:string'),
+	'birthday' => array('name'=>'birthday','type'=>'xsd:string'),
+	'default_lang' => array('name'=>'default_lang','type'=>'xsd:string'),
+	'note' => array('name'=>'note','type'=>'xsd:string'),
+	'no_email' => array('name'=>'no_email','type'=>'xsd:string'),
+	'ref_facturation' => array('name'=>'ref_facturation','type'=>'xsd:string'),
+	'ref_contrat' => array('name'=>'ref_contrat','type'=>'xsd:string'),
+	'ref_commande' => array('name'=>'ref_commande','type'=>'xsd:string'),
+	'ref_propal' => array('name'=>'ref_propal','type'=>'xsd:string'),
+	'user_id' => array('name'=>'user_id','type'=>'xsd:string'),
+	'user_login' => array('name'=>'user_login','type'=>'xsd:string'),
+	'civility_id' => array('name'=>'civility_id','type'=>'xsd:string')
+	//...
+);
+//Retreive all extrafield for contact
+// fetch optionals attributes and labels
+$extrafields=new ExtraFields($db);
+$extralabels=$extrafields->fetch_name_optionals_label('contact',true);
+if (count($extrafields)>0) {
+	$extrafield_array = array();
+}
+foreach($extrafields->attribute_label as $key=>$label)
+{
+	$type =$extrafields->attribute_type[$key];
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
+	else {$type='xsd:string';}
+
+	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
+}
+
+$contact_fields=array_merge($contact_fields,$extrafield_array);
+
 // Define other specific objects
 $server->wsdl->addComplexType(
     'contact',
@@ -87,36 +140,7 @@ $server->wsdl->addComplexType(
     'struct',
     'all',
     '',
-    array(
-		'id' => array('name'=>'id','type'=>'xsd:string'),
-		'lastname' => array('name'=>'lastname','type'=>'xsd:string'),
-		'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
-		'address' => array('name'=>'address','type'=>'xsd:string'),
-		'zip' => array('name'=>'zip','type'=>'xsd:string'),
-		'town' => array('name'=>'town','type'=>'xsd:string'),
-		'state_id' => array('name'=>'state_id','type'=>'xsd:string'),
-		'state_code' => array('name'=>'state_code','type'=>'xsd:string'),
-		'state' => array('name'=>'state','type'=>'xsd:string'),
-		'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-		'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-		'country' => array('name'=>'country','type'=>'xsd:string'),
-		'socid' => array('name'=>'socid','type'=>'xsd:string'),
-		'status' => array('name'=>'status','type'=>'xsd:string'),
-		'code' => array('name'=>'code','type'=>'xsd:string'),
-		'email' => array('name'=>'email','type'=>'xsd:string'),
-		'birthday' => array('name'=>'birthday','type'=>'xsd:string'),
-		'default_lang' => array('name'=>'default_lang','type'=>'xsd:string'),
-		'note' => array('name'=>'note','type'=>'xsd:string'),
-		'no_email' => array('name'=>'no_email','type'=>'xsd:string'),
-		'ref_facturation' => array('name'=>'ref_facturation','type'=>'xsd:string'),
-		'ref_contrat' => array('name'=>'ref_contrat','type'=>'xsd:string'),
-		'ref_commande' => array('name'=>'ref_commande','type'=>'xsd:string'),
-		'ref_propal' => array('name'=>'ref_propal','type'=>'xsd:string'),
-		'user_id' => array('name'=>'user_id','type'=>'xsd:string'),
-		'user_login' => array('name'=>'user_login','type'=>'xsd:string'),
-		'civility_id' => array('name'=>'civility_id','type'=>'xsd:string')
-    //...
-    )
+	$contact_fields
 );
 
 $server->wsdl->addComplexType(
@@ -223,44 +247,63 @@ function getContact($authentication,$id,$ref='',$ref_ext='')
     {
         $fuser->getrights();
 
-        if ($fuser->rights->contact->read)
+        if ($fuser->rights->societe->contact->lire )
         {
             $contact=new Contact($db);
             $result=$contact->fetch($id,$ref,$ref_ext);
             if ($result > 0)
             {
+            	$contact_result_fields =array(
+	            	'id' => $contact->id,
+	            	'lastname' => $contact->lastname,
+	            	'firstname' => $contact->firstname,
+	            	'address' => $contact->address,
+	            	'zip' => $contact->zip,
+	            	'town' => $contact->town,
+	            	'state_id' => $contact->state_id,
+	            	'state_code' => $contact->state_code,
+	            	'state' => $contact->state,
+	            	'country_id' => $contact->country_id,
+	            	'country_code' => $contact->country_code,
+	            	'country' => $contact->country,
+	            	'socid' => $contact->socid,
+	            	'status' => $contact->status,
+	            	'phone_pro' => $contact->phone_pro,
+	            	'fax' => $contact->fax,
+	            	'phone_perso' => $contact->phone_perso,
+	            	'phone_mobile' => $contact->phone_mobile,
+	            	'code' => $contact->code,
+	            	'email' => $contact->email,
+	            	'birthday' => $contact->birthday,
+	            	'default_lang' => $contact->default_lang,
+	            	'note' => $contact->note,
+	            	'no_email' => $contact->no_email,
+	            	'ref_facturation' => $contact->ref_facturation,
+	            	'ref_contrat' => $contact->ref_contrat,
+	            	'ref_commande' => $contact->ref_commande,
+	            	'ref_propal' => $contact->ref_propal,
+	            	'user_id' => $contact->user_id,
+	            	'user_login' => $contact->user_login,
+	            	'civility_id' => $contact->civility_id
+            	);
+            	
+            	//Retreive all extrafield for thirdsparty
+            	// fetch optionals attributes and labels
+            	$extrafields=new ExtraFields($db);
+            	$extralabels=$extrafields->fetch_name_optionals_label('contact',true);
+            	//Get extrafield values
+            	$contact->fetch_optionals($contact->id,$extralabels);
+            	
+            	foreach($extrafields->attribute_label as $key=>$label)
+            	{
+            		$contact_result_fields=array_merge($contact_result_fields,array('options_'.$key => $contact->array_options['options_'.$key]));
+            	}
+            	
+            	
                 // Create
                 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
-			        'contact'=>array(
-						'id' => $contact->id,
-						'lastname' => $contact->lastname,
-						'firstname' => $contact->firstname,
-						'address' => $contact->address,
-						'zip' => $contact->zip,
-						'town' => $contact->town,
-						'state_id' => $contact->state_id,
-						'state_code' => $contact->state_code,
-						'state' => $contact->state,
-						'country_id' => $contact->country_id,
-						'country_code' => $contact->country_code,
-						'country' => $contact->country,
-						'socid' => $contact->socid,
-						'status' => $contact->status,
-						'code' => $contact->code,
-						'email' => $contact->email,
-						'birthday' => $contact->birthday,
-						'default_lang' => $contact->default_lang,
-						'note' => $contact->note,
-						'no_email' => $contact->no_email,
-						'ref_facturation' => $contact->ref_facturation,
-						'ref_contrat' => $contact->ref_contrat,
-						'ref_commande' => $contact->ref_commande,
-						'ref_propal' => $contact->ref_propal,
-						'user_id' => $contact->user_id,
-						'user_login' => $contact->user_login,
-						'civility_id' => $contact->civility_id
-                    )
+			        'contact'=>$contact_result_fields
                 );
             }
             else
@@ -334,6 +377,10 @@ function createContact($authentication,$contact)
 		$newobject->country=$contact['country'];
 		$newobject->socid=$contact['socid'];
 		$newobject->status=$contact['status'];
+		$newobject->phone_pro=$contact['phone_pro'];
+		$newobject->fax=$contact['fax'];
+		$newobject->phone_perso=$contact['phone_perso'];
+		$newobject->phone_mobile=$contact['phone_mobile'];
 		$newobject->code=$contact['code'];
 		$newobject->email=$contact['email'];
 		$newobject->birthday=$contact['birthday'];
@@ -346,6 +393,17 @@ function createContact($authentication,$contact)
 		$newobject->ref_propal=$contact['ref_propal'];
 		$newobject->user_id=$contact['user_id'];
 		$newobject->user_login=$contact['user_login'];
+		
+		//Retreive all extrafield for thirdsparty
+		// fetch optionals attributes and labels
+		$extrafields=new ExtraFields($db);
+		$extralabels=$extrafields->fetch_name_optionals_label('contact',true);
+		foreach($extrafields->attribute_label as $key=>$label)
+		{
+			$key='options_'.$key;
+			$newobject->array_options[$key]=$contact[$key];
+		}
+		
 
 		
 		//...
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index a49295c2ee5..82f8afbd8bf 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
 dol_syslog("Call User webservices interfaces");
@@ -150,6 +151,56 @@ $server->wsdl->addComplexType(
 	),
 	'tns:group'
 );
+$thirdpartywithuser_fields = array(
+	// For thirdparty and contact
+	'name' => array('name'=>'name','type'=>'xsd:string'),
+	'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
+	'name_thirdparty' => array('name'=>'name_thirdparty','type'=>'xsd:string'),
+	'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
+	'client' => array('name'=>'client','type'=>'xsd:string'),
+	'fournisseur' => array('name'=>'fournisseur','type'=>'xsd:string'),
+	'address' => array('name'=>'address','type'=>'xsd:string'),
+	'zip' => array('name'=>'zip','type'=>'xsd:string'),
+	'town' => array('name'=>'town','type'=>'xsd:string'),
+	'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
+	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
+	'phone' => array('name'=>'phone','type'=>'xsd:string'),
+	'phone_mobile' => array('name'=>'phone_mobile','type'=>'xsd:string'),
+	'fax' => array('name'=>'fax','type'=>'xsd:string'),
+	'email' => array('name'=>'email','type'=>'xsd:string'),
+	'url' => array('name'=>'url','type'=>'xsd:string'),
+	'profid1' => array('name'=>'profid1','type'=>'xsd:string'),
+	'profid2' => array('name'=>'profid2','type'=>'xsd:string'),
+	'profid3' => array('name'=>'profid3','type'=>'xsd:string'),
+	'profid4' => array('name'=>'profid4','type'=>'xsd:string'),
+	'profid5' => array('name'=>'profid5','type'=>'xsd:string'),
+	'profid6' => array('name'=>'profid6','type'=>'xsd:string'),
+	'capital' => array('name'=>'capital','type'=>'xsd:string'),
+	'tva_assuj' => array('name'=>'tva_assuj','type'=>'xsd:string'),
+	'tva_intra' => array('name'=>'tva_intra','type'=>'xsd:string'),
+	// 	For user
+	'login' => array('name'=>'login','type'=>'xsd:string'),
+	'password' => array('name'=>'password','type'=>'xsd:string')
+);
+
+//Retreive all extrafield for contact
+// fetch optionals attributes and labels
+$extrafields=new ExtraFields($db);
+$extralabels=$extrafields->fetch_name_optionals_label('contact',true);
+if (count($extrafields)>0) {
+	$extrafield_array = array();
+}
+foreach($extrafields->attribute_label as $key=>$label)
+{
+	$type =$extrafields->attribute_type[$key];
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
+	else {$type='xsd:string';}
+
+	$extrafield_array['contact_options_'.$key]=array('name'=>'contact_options_'.$key,'type'=>$type);
+}
+
+$thirdpartywithuser_fields=array_merge($thirdpartywithuser_fields,$extrafield_array);
+
 
 $server->wsdl->addComplexType(
 	'thirdpartywithuser',
@@ -157,36 +208,7 @@ $server->wsdl->addComplexType(
 	'struct',
 	'all',
 	'',
-	array(
-		// For thirdparty and contact
-		'name' => array('name'=>'name','type'=>'xsd:string'),
-		'firstname' => array('name'=>'firstname','type'=>'xsd:string'),
-		'name_thirdparty' => array('name'=>'name_thirdparty','type'=>'xsd:string'),
-		'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-		'client' => array('name'=>'client','type'=>'xsd:string'),
-		'fournisseur' => array('name'=>'fournisseur','type'=>'xsd:string'),
-		'address' => array('name'=>'address','type'=>'xsd:string'),
-		'zip' => array('name'=>'zip','type'=>'xsd:string'),
-		'town' => array('name'=>'town','type'=>'xsd:string'),
-		'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-		'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-		'phone' => array('name'=>'phone','type'=>'xsd:string'),
-		'fax' => array('name'=>'fax','type'=>'xsd:string'),
-		'email' => array('name'=>'email','type'=>'xsd:string'),
-		'url' => array('name'=>'url','type'=>'xsd:string'),
-		'profid1' => array('name'=>'profid1','type'=>'xsd:string'),
-		'profid2' => array('name'=>'profid2','type'=>'xsd:string'),
-		'profid3' => array('name'=>'profid3','type'=>'xsd:string'),
-		'profid4' => array('name'=>'profid4','type'=>'xsd:string'),
-		'profid5' => array('name'=>'profid5','type'=>'xsd:string'),
-		'profid6' => array('name'=>'profid6','type'=>'xsd:string'),
-		'capital' => array('name'=>'capital','type'=>'xsd:string'),
-		'tva_assuj' => array('name'=>'tva_assuj','type'=>'xsd:string'),
-		'tva_intra' => array('name'=>'tva_intra','type'=>'xsd:string'),
-		// 	For user
-		'login' => array('name'=>'login','type'=>'xsd:string'),
-		'password' => array('name'=>'password','type'=>'xsd:string')
-	)
+	$thirdpartywithuser_fields
 );
 
 
@@ -521,9 +543,21 @@ function CreateUserFromThirdparty($authentication,$thirdpartywithuser)
 						$contact->zip = $thirdparty->zip;
 						$contact->town = $thirdparty->town;
 						$contact->email = $thirdparty->email;
-						$contact->phone_pro = $thirdparty->tel;
-						$contact->phone_mobile = $thirdparty->phone_mobile;
+						$contact->phone_pro = $thirdparty->phone;
+						$contact->phone_mobile = $thirdpartywithuser['phone_mobile'];
 						$contact->fax = $thirdparty->fax;
+						
+						//Retreive all extrafield for thirdsparty
+						// fetch optionals attributes and labels
+						$extrafields=new ExtraFields($db);
+						$extralabels=$extrafields->fetch_name_optionals_label('contact',true);
+						foreach($extrafields->attribute_label as $key=>$label)
+						{
+							$key='contact_options_'.$key;
+							$contact->array_options[$key]=$thirdpartywithuser[$key];
+						}
+						
+						
 
 						$contact_id =  $contact->create($fuser);