diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 07abdb4b465..b78dc7d17a2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1055,8 +1055,12 @@ class Form
 				}
 			}
 			$out .= '</select>';
-
-			$out .= '<input id="location_incoterms" class="maxwidth100onsmartphone nomargintop nomarginbottom" name="location_incoterms" value="'.$location_incoterms.'">';
+			
+			if ($conf->use_javascript_ajax && empty($disableautocomplete = 0)) {
+		    	$out .= ajax_multiautocompleter('location_incoterms', '', DOL_URL_ROOT.'/core/ajax/locationincoterms.php')."\n";
+		    	$moreattrib .= ' autocomplete="off"';
+	    	}			
+	    	$out .= '<input id="location_incoterms" class="maxwidthonsmartphone type="text" name="location_incoterms" value="'.$location_incoterms.'">'."\n";
 
 			if (!empty($page)) {
 				$out .= '<input type="submit" class="button valignmiddle smallpaddingimp nomargintop nomarginbottom" value="'.$langs->trans("Modify").'"></form>';