diff --git a/back/config/schemas/settings.schema.json.erb b/back/config/schemas/settings.schema.json.erb
index 3b3c43b30c8d..752c93441e8d 100644
--- a/back/config/schemas/settings.schema.json.erb
+++ b/back/config/schemas/settings.schema.json.erb
@@ -1372,8 +1372,7 @@
     "large_summaries": ["analysis"],
     "ask_a_question": ["analysis"],
     "advanced_autotagging": ["analysis"],
-    "import_printed_forms": ["input_importer"],
-    "gravatar_avatars": ["user_avatars"]
+    "import_printed_forms": ["input_importer"]
   },
   "definitions": {
     "multiloc_string": {
diff --git a/front/app/components/FormBuilder/components/FormBuilderToolbox/ToolboxItem.tsx b/front/app/components/FormBuilder/components/FormBuilderToolbox/ToolboxItem.tsx
index 4901941a66fb..6f5f5ab1c5ef 100644
--- a/front/app/components/FormBuilder/components/FormBuilderToolbox/ToolboxItem.tsx
+++ b/front/app/components/FormBuilder/components/FormBuilderToolbox/ToolboxItem.tsx
@@ -94,7 +94,7 @@ const ToolboxItem = ({
         <StyledBox
           display="flex"
           p="18px"
-          onClick={onClick}
+          onClick={disabled ? () => {} : onClick}
           width="100%"
           m="0px"
           alignItems="center"