diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index e2e212e1936..57732d7fe8e 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -773,6 +773,28 @@ class Expedition extends CommonObject
 			}
 		}
 	}
+	
+	/*
+	 Get id of default expedition method
+	 */
+	function GetIdOfDefault()
+	{
+		global $conf;
+
+		$sql = "SELECT em.rowid";
+		$sql.= " FROM ".MAIN_DB_PREFIX."expedition_methode as em";
+		$sql.= " WHERE em.code = '".strtoupper($conf->global->EXPEDITION_ADDON)."'";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($obj = $this->db->fetch_object($resql))
+			{
+				$this->default_method_id = $obj->rowid;
+			}
+		}
+	}
+	
 	/*
 	 Get tracking url status
 	 */
@@ -786,9 +808,9 @@ class Expedition extends CommonObject
 		if ($resql)
 		{
 			if ($obj = $this->db->fetch_object($resql))
-	  {
-	  	$code = $obj->code;
-	  }
+			{
+				$code = $obj->code;
+			}
 		}
 
 		if ($code) {
@@ -796,8 +818,17 @@ class Expedition extends CommonObject
 			require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_".strtolower($code).".modules.php");
 			$obj = new $classe;
 			$url = $obj->provider_url_status($this->tracking_number);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">url</a>',$url,$url);
-		} else {
+			if ($url)
+			{
+				$this->tracking_url = sprintf('<a target="_blank" href="%s">url</a>',$url,$url);
+			}
+			else
+			{
+				$this->tracking_url = '';
+			}
+		}
+		else
+		{
 			$this->tracking_url = '';
 		}
 	}
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index ad2c18d9b61..600e0657eea 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -318,7 +318,8 @@ if ($_GET["action"] == 'create')
 			print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
 			print '<td colspan="3">';
 			$expe->fetch_delivery_methods();
-			$html->select_array("expedition_method_id",$expe->meths,'',0,0,0,0,"",1);
+			$expe->GetIdOfDefault();
+			$html->select_array("expedition_method_id",$expe->meths,$expe->default_method_id,0,0,0,0,"",1);
 			print "</td></tr>\n";
 
 			// Tracking number
@@ -690,7 +691,11 @@ else
 
 			// Tracking Number
 			print '<tr><td>'.$langs->trans("TrackingNumber").'</td>';
-			print '<td>'.$expedition->tracking_number.'</td><td colspan="2">'.$expedition->tracking_url."</td>\n";
+			print '<td>'.$expedition->tracking_number.'</td>';
+			if ($expedition->tracking_url)
+			{
+				print '<td colspan="2">'.$expedition->tracking_url."</td>\n";
+			}
 			print '</tr>';
 
 			print "</table>\n";
diff --git a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php b/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
index d98e02ca7b4..2c689e71969 100644
--- a/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition_enl.modules.php
@@ -34,6 +34,11 @@ Class methode_expedition_enl extends methode_expedition
 		$this->code = "ENL";
 		$this->description = $langs->trans("Enlevement");
 	}
+	
+	Function provider_url_status($tracking_number)
+  {
+  	return '';
+  }
 }
 
 ?>
diff --git a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php b/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
index 59b4b133fc6..2954592ac66 100644
--- a/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition_trans.modules.php
@@ -35,6 +35,11 @@ Class methode_expedition_trans extends methode_expedition
 		$this->name = "Transporteur";
 		$this->description = $langs->trans("GenericTransport");
 	}
+	
+	Function provider_url_status($tracking_number)
+  {
+  	return '';
+  }
 }
 
 ?>