diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ad387968520..f9be689faf2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -153,12 +153,12 @@ class Form
      */
     function editInPlace($value, $htmlname, $condition, $type='area')
     {
-    	global $user;
+    	global $conf,$user;
     	
     	$out='';
     	$value = ($value ? $value : " ");
     	
-    	if ($condition)
+    	if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && $condition)
     	{
     		$out.= '<div class="edit_'.$type.'" id="'.$htmlname.'">';
     		$out.= $value;