diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5_gadgetfield.js.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5_gadgetfield.js.xml
index 8c42096d6f8cfe49e3bcaf555663d4a68cf1bc1c..d41fca088254d6b6540b100c3fa765a2109db34f 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5_gadgetfield.js.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5_gadgetfield.js.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts16413519.07</string> </value>
+            <value> <string>ts17000485.95</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -101,8 +101,8 @@
           list.push(g.getDeclaredGadget(scope));\n
           tmp.sandbox = list_gadget[i].getAttribute("data-gadget-sandbox");\n
           tmp.key = scope;\n
-          tmp.editable = list_gadget[i].getAttribute("editable");\n
-          tmp.value = list_gadget[i].getAttribute("value");\n
+          tmp.editable = list_gadget[i].getAttribute("data-gadget-editable");\n
+          tmp.value = list_gadget[i].getAttribute("data-gadget-value");\n
           gadget_attributes.push(tmp);\n
         }\n
       }\n
@@ -216,7 +216,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>6233</int> </value>
+            <value> <int>6257</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/product/ERP5Form/GadgetField.py b/product/ERP5Form/GadgetField.py
index 41e72cf43dc31e951ef897301fec328aefc8af19..dc39cfa8848f79f1659978e1a83b894e0f671ebc 100755
--- a/product/ERP5Form/GadgetField.py
+++ b/product/ERP5Form/GadgetField.py
@@ -32,9 +32,9 @@ class GadgetWidget(Widget.TextWidget):
      kw['data-gadget-url'] = field.get_value('gadget_url')
      kw['data-gadget-scope'] = field.id
      if key is not None:
-       kw['editable'] = key
+       kw['data-gadget-editable'] = key
      kw['class'] = "gadget"
-     kw['value'] = value
+     kw['data-gadget-value'] = value
      kw['data-gadget-sandbox'] = field.get_value('js_sandbox')
      return Widget.render_element("div",
                       **kw)