diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e017c298089efd7c3c6c25c3eb902cff35d9cce0..764c1feb8757a8a6e5fc7e8d8e545e20795d1182 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3266,11 +3266,11 @@ class Form
             {
                 if ($selected == $res->rowid)
                 {
-                    $return.='<option value="'.$res->rowid.'" selected>'.$langs->trans($res->label).'</option>';
+                    $return.='<option value="'.$res->rowid.'" selected>'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
                 }
                 else
                 {
-                    $return.='<option value="'.$res->rowid.'">'.$langs->trans($res->label).'</option>';
+                    $return.='<option value="'.$res->rowid.'">'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
                 }
             }
             $return.='</select>';
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 9897facb0bb25abba1e6b694c570aabaaa0cf882..b38b714ddfb2702a911f993f1ef38503dd4def14 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -175,6 +175,18 @@ m2=m²
 m3=m³
 liter=liter
 l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitKG=Kilogram
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 CurrentProductPrice=Current price