diff --git a/ChangeLog b/ChangeLog
index af3f8290f70..a00f52055f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ For users:
 - New: Increase usability of module project.
 - New: Automatic list of documents in ECM module is ok for customers,
        suppliers invoice, orders, customers orders, proposals and social contributions.
+- New: All professional id can contains up to 128 chars instead of 32. 
 - New: [ task #176 ] Allow to use ODT templates for proposals and orders like it's done for invoices
 - Fix: Can use POS module with several concurrent users.
 - Fix: Installer don't fails with Mysql version that added a ssl_cypher field.
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index c0adef92519..1f81f385944 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -528,7 +528,7 @@ class FormCompany
 			}
 		}
 		$sql.= " ORDER BY nom ASC";
-		
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -669,7 +669,7 @@ class FormCompany
     {
         global $conf,$langs;
 
-        $formlength=24;
+        $formlength=0;
         if ($country_code == 'FR' && empty($conf->global->MAIN_DISABLEPROFIDRULES))
         {
             if ($idprof==1) $formlength=9;
@@ -691,7 +691,10 @@ class FormCompany
         if (! $selected && $idprof==3) $selected=$this->idprof3;
         if (! $selected && $idprof==4) $selected=$this->idprof4;
 
-        $out = '<input type="text" name="'.$htmlname.'" size="'.($formlength+1).'" maxlength="'.$formlength.'" value="'.$selected.'">';
+        $maxlength=$formlength;
+        if (empty($formlength)) { $formlength=24; $maxlength=128; }
+
+        $out = '<input type="text" name="'.$htmlname.'" size="'.($formlength+1).'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
     }