diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index a18aa9a8e7e..98a47d7b1f7 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -200,7 +200,7 @@ if ($socid > 0)
     print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">';
     print $objsoc->nom;
     print '</td></tr>';
-    print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($objsoc->address)."<br>".$objsoc->cp." ".$objsoc->ville." ".$objsoc->pays."</td></tr>";
+    print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($objsoc->adresse)."<br>".$objsoc->cp." ".$objsoc->ville." ".$objsoc->pays."</td></tr>";
     print "<tr><td>Téléphone</td><td> $objsoc->tel&nbsp;</td><td>Fax</td><td>$objsoc->fax&nbsp;</td></tr>";
     print "<tr><td>Web</td><td colspan=\"3\"><a href=\"http://$objsoc->url\">$objsoc->url</a>&nbsp;</td></tr>";
 
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 26930f1f580..d0203f401db 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -286,7 +286,7 @@ else
   print '<table class="border" cellpadding="3" cellspacing="0" width="100%">';
   print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">'.$soc->nom.'</td></tr>';
 
-  print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($soc->address)."<br>".$soc->cp." ".$soc->ville." ".$soc->pays."</td></tr>";
+  print "<tr><td valign=\"top\">Adresse</td><td colspan=\"3\">".nl2br($soc->adresse)."<br>".$soc->cp." ".$soc->ville." ".$soc->pays."</td></tr>";
 
   print '<tr><td>Téléphone</td><td>'.dolibarr_print_phone($soc->tel).'</td>';
   print '<td>Fax</td><td>'.dolibarr_print_phone($soc->fax).'</td></tr>';
diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php
index 3df3c316e90..46e3fb2b679 100644
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -1,7 +1,8 @@
 <?PHP
-/* Copyright (C) 2003 Brian Fraval <brian@fraval.org>
+/* Copyright (C) 2003      Brian Fraval         <brian@fraval.org>
  * Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -164,12 +165,11 @@ class Societe {
 
 	      $this->departement_id = $obj->fk_departement;
 	      $this->pays_id = $obj->fk_pays;
+	      $this->pays = $obj->fk_pays?$obj->pays:'';
 
 	      $this->stcomm_id = $obj->fk_stcomm; // statut commercial
 	      $this->statut_commercial = $obj->stcomm; // statut commercial
 
-	      $this->pays = $obj->pays;
-
 	      $this->url = $obj->url;
 
 	      $this->tel = $obj->tel;