diff --git a/openbas-api/src/main/java/io/openbas/rest/scenario/form/ScenarioInput.java b/openbas-api/src/main/java/io/openbas/rest/scenario/form/ScenarioInput.java
index 7c98c9ff2a..8aec4cba8d 100644
--- a/openbas-api/src/main/java/io/openbas/rest/scenario/form/ScenarioInput.java
+++ b/openbas-api/src/main/java/io/openbas/rest/scenario/form/ScenarioInput.java
@@ -5,9 +5,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.openbas.database.model.Scenario.SEVERITY;
 import jakarta.annotation.Nullable;
+import jakarta.persistence.Column;
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -45,4 +49,19 @@ public class ScenarioInput {
 
   @JsonProperty("scenario_tags")
   private List<String> tagIds = new ArrayList<>();
+
+  @JsonProperty("scenario_mail_from")
+  @Email
+  @NotBlank
+  private String from;
+
+  @Column(name = "scenario_reply_to", nullable = false)
+  @JsonProperty("scenario_mails_reply_to")
+  private List<String> replyTos = new ArrayList<>();
+
+  @JsonProperty("scenario_message_header")
+  private String header;
+
+  @JsonProperty("scenario_message_footer")
+  private String footer;
 }
diff --git a/openbas-api/src/main/java/io/openbas/rest/settings/response/PlatformSettings.java b/openbas-api/src/main/java/io/openbas/rest/settings/response/PlatformSettings.java
index f65cf2f15d..a80b776357 100644
--- a/openbas-api/src/main/java/io/openbas/rest/settings/response/PlatformSettings.java
+++ b/openbas-api/src/main/java/io/openbas/rest/settings/response/PlatformSettings.java
@@ -6,10 +6,12 @@
 import io.openbas.rest.settings.form.PolicyInput;
 import io.openbas.rest.settings.form.ThemeInput;
 import jakarta.validation.constraints.NotNull;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -158,4 +160,11 @@ public Map<String, List<String>> getPlatformBannerByLevel() {
   @NotNull
   @JsonProperty("expectation_manual_default_score_value")
   private int expectationDefaultScoreValue;
+
+  // EMAIL CONFIG
+  @JsonProperty("default_mailer")
+  private String defaultMailer;
+
+  @JsonProperty("default_reply_to")
+  private String defaultReplyTo;
 }
diff --git a/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java b/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java
index 51051cb457..1760185b63 100644
--- a/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java
+++ b/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java
@@ -22,9 +22,11 @@
 import io.openbas.rest.stream.ai.AiConfig;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotBlank;
+
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
@@ -48,9 +50,12 @@ public class PlatformSettingsService {
   private AiConfig aiConfig;
   private CalderaExecutorConfig calderaExecutorConfig;
 
-  @Resource private OpenBASConfig openBASConfig;
-  @Resource private ExpectationPropertiesConfig expectationPropertiesConfig;
-  @Resource private RabbitmqConfig rabbitmqConfig;
+  @Resource
+  private OpenBASConfig openBASConfig;
+  @Resource
+  private ExpectationPropertiesConfig expectationPropertiesConfig;
+  @Resource
+  private RabbitmqConfig rabbitmqConfig;
 
   @Autowired
   public void setOpenCTIConfig(OpenCTIConfig openCTIConfig) {
@@ -180,6 +185,8 @@ public PlatformSettings findSettings() {
         ofNullable(dbSettings.get(DEFAULT_LANG.key()))
             .map(Setting::getValue)
             .orElse(DEFAULT_LANG.defaultValue()));
+    platformSettings.setDefaultMailer(openBASConfig.getDefaultMailer());
+    platformSettings.setDefaultReplyTo(openBASConfig.getDefaultReplyTo());
 
     // Build authenticated user settings
     OpenBASPrincipal user = currentUser();
diff --git a/openbas-front/src/admin/components/common/injects/Injects.tsx b/openbas-front/src/admin/components/common/injects/Injects.tsx
index 91500f4c83..cf36a52301 100644
--- a/openbas-front/src/admin/components/common/injects/Injects.tsx
+++ b/openbas-front/src/admin/components/common/injects/Injects.tsx
@@ -580,7 +580,7 @@ const Injects: FunctionComponent<Props> = ({
                     checked={
                       (selectAll && !(inject.inject_id
                         in (deSelectedElements || {})))
-                        || inject.inject_id in (selectedElements || {})
+                          || inject.inject_id in (selectedElements || {})
                     }
                     disableRipple
                   />
diff --git a/openbas-front/src/admin/components/scenarios/ScenarioCreation.tsx b/openbas-front/src/admin/components/scenarios/ScenarioCreation.tsx
index 7b5471aac0..fb3c08afe9 100644
--- a/openbas-front/src/admin/components/scenarios/ScenarioCreation.tsx
+++ b/openbas-front/src/admin/components/scenarios/ScenarioCreation.tsx
@@ -1,13 +1,17 @@
 import { FunctionComponent, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
+import { fetchPlatformParameters } from '../../../actions/Application';
+import { LoggedHelper } from '../../../actions/helper';
 import type { ScenarioStore } from '../../../actions/scenarios/Scenario';
 import { addScenario } from '../../../actions/scenarios/scenario-actions';
 import ButtonCreate from '../../../components/common/ButtonCreate';
 import Drawer from '../../../components/common/Drawer';
 import { useFormatter } from '../../../components/i18n';
-import type { ScenarioInput } from '../../../utils/api-types';
+import { useHelper } from '../../../store';
+import type { PlatformSettings, ScenarioInput } from '../../../utils/api-types';
 import { useAppDispatch } from '../../../utils/hooks';
+import useDataLoader from '../../../utils/hooks/useDataLoader';
 import ScenarioForm from './ScenarioForm';
 
 interface Props {
@@ -23,6 +27,7 @@ const ScenarioCreation: FunctionComponent<Props> = ({
   const navigate = useNavigate();
 
   const dispatch = useAppDispatch();
+
   const onSubmit = (data: ScenarioInput) => {
     dispatch(addScenario(data)).then(
       (result: { result: string; entities: { scenarios: Record<string, ScenarioStore> } }) => {
@@ -38,6 +43,29 @@ const ScenarioCreation: FunctionComponent<Props> = ({
     );
   };
 
+  const { settings }: { settings: PlatformSettings } = useHelper((helper: LoggedHelper) => ({
+    settings: helper.getPlatformSettings(),
+  }));
+  useDataLoader(() => {
+    dispatch(fetchPlatformParameters());
+  });
+
+  const initialValues: ScenarioInput = {
+    scenario_name: '',
+    scenario_category: 'attack-scenario',
+    scenario_main_focus: 'incident-response',
+    scenario_severity: 'high',
+    scenario_subtitle: '',
+    scenario_description: '',
+    scenario_external_reference: '',
+    scenario_external_url: '',
+    scenario_tags: [],
+    scenario_message_header: 'SIMULATION HEADER',
+    scenario_message_footer: 'SIMULATION FOOTER',
+    scenario_mail_from: settings.default_mailer ? settings.default_mailer : '',
+    scenario_mails_reply_to: [settings.default_reply_to ? settings.default_reply_to : ''],
+  };
+
   return (
     <>
       <ButtonCreate onClick={() => setOpen(true)} />
@@ -48,6 +76,7 @@ const ScenarioCreation: FunctionComponent<Props> = ({
       >
         <ScenarioForm
           onSubmit={onSubmit}
+          initialValues={initialValues}
           handleClose={() => setOpen(false)}
         />
       </Drawer>
diff --git a/openbas-front/src/admin/components/scenarios/ScenarioForm.tsx b/openbas-front/src/admin/components/scenarios/ScenarioForm.tsx
index d5f93a601f..0dad01346b 100644
--- a/openbas-front/src/admin/components/scenarios/ScenarioForm.tsx
+++ b/openbas-front/src/admin/components/scenarios/ScenarioForm.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Button, MenuItem } from '@mui/material';
-import { FunctionComponent } from 'react';
+import { Alert, AlertTitle, Autocomplete, Button, Chip, Grid, MenuItem, TextField as MuiTextField, Typography } from '@mui/material';
+import { FunctionComponent, useState } from 'react';
 import { Controller, SubmitHandler, useForm } from 'react-hook-form';
 import { z } from 'zod';
 
@@ -16,27 +16,20 @@ interface Props {
   onSubmit: SubmitHandler<ScenarioInput>;
   handleClose: () => void;
   editing?: boolean;
-  initialValues?: ScenarioInput;
+  disabled?: boolean;
+  initialValues: ScenarioInput;
 }
 
 const ScenarioForm: FunctionComponent<Props> = ({
   onSubmit,
   handleClose,
   editing,
-  initialValues = {
-    scenario_name: '',
-    scenario_category: 'attack-scenario',
-    scenario_main_focus: 'incident-response',
-    scenario_severity: 'high',
-    scenario_subtitle: '',
-    scenario_description: '',
-    scenario_external_reference: '',
-    scenario_external_url: '',
-    scenario_tags: [],
-  },
+  initialValues,
+  disabled,
 }) => {
   // Standard hooks
   const { t } = useFormatter();
+  const [inputValue, setInputValue] = useState('');
 
   const {
     register,
@@ -57,12 +50,23 @@ const ScenarioForm: FunctionComponent<Props> = ({
         scenario_tags: z.string().array().optional(),
         scenario_external_reference: z.string().optional(),
         scenario_external_url: z.string().optional(),
+        scenario_mail_from: z.string().email(t('Should be a valid email address')),
+        scenario_mails_reply_to: z.array(z.string().email(t('Should be a valid email address'))).optional(),
+        scenario_message_header: z.string().optional(),
+        scenario_message_footer: z.string().optional(),
       }),
     ),
     defaultValues: initialValues,
   });
   return (
     <form id="scenarioForm" onSubmit={handleSubmit(onSubmit)}>
+      <Typography
+        variant="h2"
+        gutterBottom
+        style={{ marginTop: 20 }}
+      >
+        {t('General')}
+      </Typography>
       <TextField
         variant="standard"
         fullWidth
@@ -76,51 +80,58 @@ const ScenarioForm: FunctionComponent<Props> = ({
         setValue={setValue}
         askAi={true}
       />
-      <SelectField
-        variant="standard"
-        fullWidth={true}
-        name="scenario_category"
-        label={t('Category')}
-        style={{ marginTop: 20 }}
-        error={!!errors.scenario_category}
-        control={control}
-        defaultValue={initialValues.scenario_category}
-      >
-        {Array.from(scenarioCategories).map(([key, value]) => (
-          <MenuItem key={key} value={key}>
-            {t(value)}
-          </MenuItem>
-        ))}
-      </SelectField>
-      <SelectField
-        variant="standard"
-        fullWidth={true}
-        name="scenario_main_focus"
-        label={t('Main focus')}
-        style={{ marginTop: 20 }}
-        error={!!errors.scenario_main_focus}
-        control={control}
-        defaultValue={initialValues.scenario_main_focus}
-      >
-        <MenuItem key="endpoint-protection" value="endpoint-protection">
-          {t('Endpoint Protection')}
-        </MenuItem>
-        <MenuItem key="web-filtering" value="web-filtering">
-          {t('Web Filtering')}
-        </MenuItem>
-        <MenuItem key="incident-response" value="incident-response">
-          {t('Incident Response')}
-        </MenuItem>
-        <MenuItem key="standard-operating-procedure" value="standard-operating-procedure">
-          {t('Standard Operating Procedures')}
-        </MenuItem>
-        <MenuItem key="crisis-communication" value="crisis-communication">
-          {t('Crisis Communication')}
-        </MenuItem>
-        <MenuItem key="strategic-reaction" value="strategic-reaction">
-          {t('Strategic Reaction')}
-        </MenuItem>
-      </SelectField>
+      <Grid container spacing={2}>
+        <Grid item xs={7}>
+          <SelectField
+            variant="standard"
+            fullWidth={true}
+            name="scenario_category"
+            label={t('Category')}
+            style={{ marginTop: 20 }}
+            error={!!errors.scenario_category}
+            control={control}
+            defaultValue={initialValues.scenario_category}
+          >
+            {Array.from(scenarioCategories).map(([key, value]) => (
+              <MenuItem key={key} value={key}>
+                {t(value)}
+              </MenuItem>
+            ))}
+          </SelectField>
+        </Grid>
+        <Grid item xs={5}>
+          <SelectField
+            variant="standard"
+            fullWidth={true}
+            name="scenario_main_focus"
+            label={t('Main focus')}
+            style={{ marginTop: 20 }}
+            error={!!errors.scenario_main_focus}
+            control={control}
+            defaultValue={initialValues.scenario_main_focus}
+          >
+            <MenuItem key="endpoint-protection" value="endpoint-protection">
+              {t('Endpoint Protection')}
+            </MenuItem>
+            <MenuItem key="web-filtering" value="web-filtering">
+              {t('Web Filtering')}
+            </MenuItem>
+            <MenuItem key="incident-response" value="incident-response">
+              {t('Incident Response')}
+            </MenuItem>
+            <MenuItem key="standard-operating-procedure" value="standard-operating-procedure">
+              {t('Standard Operating Procedures')}
+            </MenuItem>
+            <MenuItem key="crisis-communication" value="crisis-communication">
+              {t('Crisis Communication')}
+            </MenuItem>
+            <MenuItem key="strategic-reaction" value="strategic-reaction">
+              {t('Strategic Reaction')}
+            </MenuItem>
+          </SelectField>
+        </Grid>
+      </Grid>
+
       <SelectField
         variant="standard"
         fullWidth={true}
@@ -172,6 +183,107 @@ const ScenarioForm: FunctionComponent<Props> = ({
           />
         )}
       />
+      <Typography
+        variant="h2"
+        gutterBottom
+        style={{ marginTop: 40 }}
+      >
+        {t('Emails and SMS')}
+      </Typography>
+
+      <MuiTextField
+        variant="standard"
+        fullWidth
+        label={t('Sender email address')}
+        style={{ marginTop: 20 }}
+        error={!!errors.scenario_mail_from}
+        helperText={errors.scenario_mail_from && errors.scenario_mail_from?.message}
+        inputProps={register('scenario_mail_from')}
+        disabled={disabled}
+      />
+
+      <Controller
+        control={control}
+        name="scenario_mails_reply_to"
+        render={({ field, fieldState }) => {
+          return (
+            <Autocomplete
+              multiple
+              id="email-reply-to-input"
+              freeSolo
+              open={false}
+              options={[]}
+              value={field.value}
+              onChange={() => {
+                if (undefined !== field.value && inputValue !== '' && !field.value.includes(inputValue)) {
+                  field.onChange([...(field.value || []), inputValue.trim()]);
+                }
+              }}
+              onBlur={field.onBlur}
+              inputValue={inputValue}
+              onInputChange={(_event, newInputValue) => {
+                setInputValue(newInputValue);
+              }}
+              disableClearable={true}
+              renderTags={(tags: string[], getTagProps) => tags.map((email: string, index: number) => {
+                return (
+                  <Chip
+                    variant="outlined"
+                    label={email}
+                    {...getTagProps({ index })}
+                    key={email}
+                    style={{ borderRadius: 4 }}
+                    onDelete={() => {
+                      const newValue = [...(field.value || [])];
+                      newValue.splice(index, 1);
+                      field.onChange(newValue);
+                    }}
+                  />
+                );
+              })}
+              renderInput={params => (
+                <MuiTextField
+                  {...params}
+                  variant="standard"
+                  label={t('Reply to')}
+                  style={{ marginTop: 20 }}
+                  error={!!fieldState.error}
+                  helperText={errors.scenario_mails_reply_to?.find ? errors.scenario_mails_reply_to?.find(value => value != null)?.message ?? '' : ''}
+                />
+              )}
+            />
+          );
+        }}
+      />
+      <Alert
+        severity="warning"
+        variant="outlined"
+        style={{ position: 'relative', border: 'none' }}
+      >
+        <AlertTitle>
+          {t('If you remove the default email address, the email reception for this simulation / scenario will be disabled.')}
+        </AlertTitle>
+      </Alert>
+      <MuiTextField
+        variant="standard"
+        fullWidth
+        label={t('Messages header')}
+        style={{ marginTop: 20 }}
+        error={!!errors.scenario_message_header}
+        helperText={errors.scenario_message_header && errors.scenario_message_header?.message}
+        inputProps={register('scenario_message_header')}
+        disabled={disabled}
+      />
+      <MuiTextField
+        variant="standard"
+        fullWidth
+        label={t('Messages footer')}
+        style={{ marginTop: 20 }}
+        error={!!errors.scenario_message_footer}
+        helperText={errors.scenario_message_footer && errors.scenario_message_footer?.message}
+        inputProps={register('scenario_message_footer')}
+        disabled={disabled}
+      />
       <div style={{ float: 'right', marginTop: 20 }}>
         <Button
           variant="contained"
diff --git a/openbas-front/src/admin/components/scenarios/scenario/ScenarioUpdate.tsx b/openbas-front/src/admin/components/scenarios/scenario/ScenarioUpdate.tsx
index 9003b6786a..5e6ff0d178 100644
--- a/openbas-front/src/admin/components/scenarios/scenario/ScenarioUpdate.tsx
+++ b/openbas-front/src/admin/components/scenarios/scenario/ScenarioUpdate.tsx
@@ -1,15 +1,12 @@
-import { Box, Tab, Tabs } from '@mui/material';
-import { FunctionComponent, useState } from 'react';
-import * as React from 'react';
+import { FunctionComponent } from 'react';
 
 import type { ScenarioStore } from '../../../../actions/scenarios/Scenario';
-import { updateScenario, updateScenarioInformation } from '../../../../actions/scenarios/scenario-actions';
+import { updateScenario } from '../../../../actions/scenarios/scenario-actions';
 import Drawer from '../../../../components/common/Drawer';
 import { useFormatter } from '../../../../components/i18n';
-import type { ScenarioInformationInput, ScenarioInput } from '../../../../utils/api-types';
+import type { ScenarioInput } from '../../../../utils/api-types';
 import { useAppDispatch } from '../../../../utils/hooks';
 import useScenarioPermissions from '../../../../utils/Scenario';
-import EmailParametersForm, { SettingUpdateInput } from '../../common/simulate/EmailParametersForm';
 import ScenarioForm from '../ScenarioForm';
 
 interface Props {
@@ -28,10 +25,6 @@ const ScenarioUpdate: FunctionComponent<Props> = ({
   const dispatch = useAppDispatch();
   const permissions = useScenarioPermissions(scenario.scenario_id);
 
-  // Tabs
-  const [currentTab, setCurrentTab] = useState(0);
-  const handleChangeTab = (event: React.SyntheticEvent, value: number) => setCurrentTab(value);
-
   // Scenario form
   const initialValues = (({
     scenario_name,
@@ -43,6 +36,10 @@ const ScenarioUpdate: FunctionComponent<Props> = ({
     scenario_tags,
     scenario_external_reference,
     scenario_external_url,
+    scenario_message_header,
+    scenario_message_footer,
+    scenario_mail_from,
+    scenario_mails_reply_to,
   }) => ({
     scenario_name,
     scenario_subtitle: scenario_subtitle ?? '',
@@ -53,58 +50,29 @@ const ScenarioUpdate: FunctionComponent<Props> = ({
     scenario_tags: scenario_tags ?? [],
     scenario_external_reference: scenario_external_reference ?? '',
     scenario_external_url: scenario_external_url ?? '',
+    scenario_message_header: scenario_message_header ?? '',
+    scenario_message_footer: scenario_message_footer ?? '',
+    scenario_mail_from: scenario_mail_from ?? '',
+    scenario_mails_reply_to: scenario_mails_reply_to ?? [],
   }))(scenario);
   const submitEdit = (data: ScenarioInput) => {
     dispatch(updateScenario(scenario.scenario_id, data));
     handleClose();
   };
 
-  // Email parameters
-  const initialValuesEmailParameters = {
-    setting_mail_from: scenario.scenario_mail_from,
-    setting_mails_reply_to: scenario.scenario_mails_reply_to,
-    setting_message_header: scenario.scenario_message_header,
-    setting_message_footer: scenario.scenario_message_footer,
-  };
-  const submitUpdateEmailParameters = (data: SettingUpdateInput) => {
-    const scenarioInformationInput: ScenarioInformationInput = {
-      scenario_mail_from: data.setting_mail_from || '',
-      scenario_mails_reply_to: data.setting_mails_reply_to,
-      scenario_message_header: data.setting_message_header,
-      scenario_message_footer: scenario.scenario_message_footer,
-    };
-    dispatch(updateScenarioInformation(scenario.scenario_id, scenarioInformationInput)).then(() => handleClose());
-  };
-
   return (
     <Drawer
       open={open}
       handleClose={handleClose}
       title={t('Update the scenario')}
     >
-      <>
-        <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
-          <Tabs value={currentTab} onChange={handleChangeTab}>
-            <Tab label={t('Overview')} />
-            <Tab label={t('Mail configuration')} />
-          </Tabs>
-        </Box>
-        {currentTab === 0 && (
-          <ScenarioForm
-            initialValues={initialValues}
-            editing
-            onSubmit={submitEdit}
-            handleClose={handleClose}
-          />
-        )}
-        {currentTab === 1 && (
-          <EmailParametersForm
-            initialValues={initialValuesEmailParameters}
-            onSubmit={submitUpdateEmailParameters}
-            disabled={permissions.readOnly}
-          />
-        )}
-      </>
+      <ScenarioForm
+        initialValues={initialValues}
+        editing
+        disabled={permissions.readOnly}
+        onSubmit={submitEdit}
+        handleClose={handleClose}
+      />
     </Drawer>
   );
 };
diff --git a/openbas-front/src/admin/components/settings/data_ingestion/xls_mapper/RulesContractContent.tsx b/openbas-front/src/admin/components/settings/data_ingestion/xls_mapper/RulesContractContent.tsx
index 89402490c9..f130c9d3d1 100644
--- a/openbas-front/src/admin/components/settings/data_ingestion/xls_mapper/RulesContractContent.tsx
+++ b/openbas-front/src/admin/components/settings/data_ingestion/xls_mapper/RulesContractContent.tsx
@@ -246,8 +246,8 @@ const RulesContractContent: React.FC<Props> = ({
                   variant="dot"
                   invisible={(!methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_default_value`)
                     || methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_default_value`)?.length === 0)
-                  && (!methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config.timePattern`)
-                    || methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config`)?.timePattern?.length === 0)}
+                    && (!methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config.timePattern`)
+                      || methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config`)?.timePattern?.length === 0)}
                 >
                   <CogOutline />
                 </Badge>
@@ -259,8 +259,8 @@ const RulesContractContent: React.FC<Props> = ({
                   variant="dot"
                   invisible={(!methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_default_value`)
                     || methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_default_value`)?.length === 0)
-                  && (!methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config.allTeamsValue`)
-                    || methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config`)?.allTeamsValue?.length === 0)}
+                    && (!methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config.allTeamsValue`)
+                      || methods.getValues(`import_mapper_inject_importers.${index}.inject_importer_rule_attributes.${rulesIndex}.rule_attribute_additional_config`)?.allTeamsValue?.length === 0)}
                 >
                   <CogOutline />
                 </Badge>
diff --git a/openbas-front/src/utils/Localization.js b/openbas-front/src/utils/Localization.js
index b3fbdb5a7e..0ad59ae86b 100644
--- a/openbas-front/src/utils/Localization.js
+++ b/openbas-front/src/utils/Localization.js
@@ -768,6 +768,7 @@ const i18n = {
       'Percent of reached score': 'Pourcentage du score atteint',
       'Pause': 'Pause',
       'Resume': 'Reprendre',
+      'Emails and SMS': 'Emails et SMS',
       'injects': 'injects',
       'Paused': 'En pause',
       'Canceled': 'Annulé',
@@ -782,6 +783,7 @@ const i18n = {
       'Questionnaire': 'Questionnaire',
       'User': 'Utilisateur',
       'Modules': 'Modules',
+      'General': 'Général',
       'Access reports': 'Accéder aux rapports',
       'General information': 'Informations générales',
       'There is no report for this simulation yet': 'Il n\'y a pas encore de rapport pour cette simulation',
@@ -2149,6 +2151,7 @@ const i18n = {
       'Percent of reached score': '达到分数百分比',
       'Pause': '暂停',
       'Resume': '恢复',
+      'Emails and SMS': '电子邮件和短信',
       'injects': '注入',
       'Paused': '已暂停',
       'Canceled': '已取消',
@@ -2163,6 +2166,7 @@ const i18n = {
       'Modules': '模块',
       'Access reports': '访问报告',
       'General information': '通用信息',
+      'General': '常规',
       'Do you want to delete this report ?': '您想删除此报告吗？',
       'There is no report for this simulation yet': '目前还没有关于此模拟的报告',
       'Player surveys': '玩家调查',
diff --git a/openbas-front/src/utils/api-types.d.ts b/openbas-front/src/utils/api-types.d.ts
index 1343bfe8b4..8686f0bc4a 100644
--- a/openbas-front/src/utils/api-types.d.ts
+++ b/openbas-front/src/utils/api-types.d.ts
@@ -465,7 +465,7 @@ export interface Communication {
 
 export interface Condition {
   key: string;
-  operator: "eq";
+  operator: "==";
   value?: boolean;
 }
 
@@ -543,6 +543,9 @@ export interface DryInjectStatus {
     | "PENDING"
     | "PARTIAL"
     | "ERROR"
+    | "WARNING"
+    | "COMMAND_NOT_FOUND"
+    | "COMMAND_CANNOT_BE_EXECUTED"
     | "MAYBE_PARTIAL_PREVENTED"
     | "MAYBE_PREVENTED"
     | "SUCCESS";
@@ -1121,7 +1124,7 @@ export interface InjectDependency {
 
 export interface InjectDependencyCondition {
   conditions?: Condition[];
-  mode: "and" | "or";
+  mode: "&&" | "||";
 }
 
 export interface InjectDependencyId {
@@ -1129,10 +1132,14 @@ export interface InjectDependencyId {
   inject_parent_id?: string;
 }
 
+export interface InjectDependencyIdInput {
+  inject_children_id?: string;
+  inject_parent_id?: string;
+}
+
 export interface InjectDependencyInput {
-  dependency_conditions?: Condition[];
-  dependency_mode?: "&&" | "||";
-  dependency_parent?: string;
+  dependency_condition?: InjectDependencyCondition;
+  dependency_relationship?: InjectDependencyIdInput;
 }
 
 export interface InjectDocument {
@@ -1333,6 +1340,9 @@ export interface InjectStatus {
     | "PENDING"
     | "PARTIAL"
     | "ERROR"
+    | "WARNING"
+    | "COMMAND_NOT_FOUND"
+    | "COMMAND_CANNOT_BE_EXECUTED"
     | "MAYBE_PARTIAL_PREVENTED"
     | "MAYBE_PREVENTED"
     | "SUCCESS";
@@ -1373,6 +1383,9 @@ export interface InjectStatusExecution {
     | "PENDING"
     | "PARTIAL"
     | "ERROR"
+    | "WARNING"
+    | "COMMAND_NOT_FOUND"
+    | "COMMAND_CANNOT_BE_EXECUTED"
     | "MAYBE_PARTIAL_PREVENTED"
     | "MAYBE_PREVENTED"
     | "SUCCESS";
@@ -1412,6 +1425,9 @@ export interface InjectTestStatus {
     | "PENDING"
     | "PARTIAL"
     | "ERROR"
+    | "WARNING"
+    | "COMMAND_NOT_FOUND"
+    | "COMMAND_CANNOT_BE_EXECUTED"
     | "MAYBE_PARTIAL_PREVENTED"
     | "MAYBE_PREVENTED"
     | "SUCCESS";
@@ -2478,6 +2494,8 @@ export interface PlatformSettings {
   platform_saml2_providers?: OAuthProvider[];
   auth_local_enable?: boolean;
   auth_openid_enable?: boolean;
+  default_mailer?: string;
+  default_reply_to?: string;
   disabled_dev_features?: string[];
   executor_caldera_enable?: boolean;
   executor_caldera_public_url?: string;
@@ -2839,7 +2857,11 @@ export interface ScenarioInput {
   scenario_description?: string;
   scenario_external_reference?: string;
   scenario_external_url?: string;
+  scenario_mail_from: string;
+  scenario_mails_reply_to?: string[];
   scenario_main_focus?: string;
+  scenario_message_footer?: string;
+  scenario_message_header?: string;
   scenario_name: string;
   scenario_severity?: "low" | "medium" | "high" | "critical";
   scenario_subtitle?: string;
diff --git a/openbas-model/src/main/java/io/openbas/database/model/Scenario.java b/openbas-model/src/main/java/io/openbas/database/model/Scenario.java
index b19e131d63..b4331a21b1 100644
--- a/openbas-model/src/main/java/io/openbas/database/model/Scenario.java
+++ b/openbas-model/src/main/java/io/openbas/database/model/Scenario.java
@@ -20,8 +20,10 @@
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import java.time.Instant;
 import java.util.*;
+
 import lombok.Data;
 import lombok.Getter;
 import org.hibernate.annotations.UuidGenerator;
@@ -31,9 +33,9 @@
 @Table(name = "scenarios")
 @EntityListeners(ModelBaseListener.class)
 @NamedEntityGraphs({
-  @NamedEntityGraph(
-      name = "Scenario.tags-injects",
-      attributeNodes = {@NamedAttributeNode("tags"), @NamedAttributeNode("injects")})
+    @NamedEntityGraph(
+        name = "Scenario.tags-injects",
+        attributeNodes = {@NamedAttributeNode("tags"), @NamedAttributeNode("injects")})
 })
 public class Scenario implements Base {
 
@@ -111,11 +113,11 @@ public enum SEVERITY {
 
   @Column(name = "scenario_message_header")
   @JsonProperty("scenario_message_header")
-  private String header = "EXERCISE - EXERCISE - EXERCISE";
+  private String header = "EXERCISE HEADER";
 
   @Column(name = "scenario_message_footer")
   @JsonProperty("scenario_message_footer")
-  private String footer = "EXERCISE - EXERCISE - EXERCISE";
+  private String footer = "EXERCISE FOOTER";
 
   @Column(name = "scenario_mail_from")
   @JsonProperty("scenario_mail_from")