diff --git a/apps/maarch_entreprise/Views/template-administration.component.html b/apps/maarch_entreprise/Views/template-administration.component.html
index 91d618c4a8f1c1ba814203a14ce02059d45bf299..09142b3a6ec1a59f79d102da0c822d98a444f41e 100755
--- a/apps/maarch_entreprise/Views/template-administration.component.html
+++ b/apps/maarch_entreprise/Views/template-administration.component.html
@@ -128,10 +128,9 @@
                                 <mat-form-field>
                                     <mat-select id="template_datasource" name="template_datasource" title="{{lang.templateDatasource}}" placeholder="{{lang.templateDatasource}}" [(ngModel)]="template.template_datasource">
                                         <mat-option value="">{{lang.noDatasource}}</mat-option>
-                                        <mat-option *ngFor="let datasource of datasourcesList" [value]="action.name">
-                                            {{action.label}}
+                                        <mat-option *ngFor="let datasource of datasourcesList" [value]="datasource.id">
+                                            {{datasource.label}}
                                         </mat-option>
-                                        <mat-option value="letterbox_attachment">[réponse] Informations du courrier entrant</mat-option>
                                     </mat-select>
                                 </mat-form-field>
                             </div>
@@ -147,11 +146,7 @@
                     <div class="form-group">
                         <div class="col-sm-12" style="text-align:center;">
                             <button mat-raised-button color="primary" type="submit" [disabled]="!templatesFormUp.form.valid">{{lang.save}}</button>
-                        </div>
-                    </div>
-                    <div class="form-group" *ngIf="!creationMode">
-                        <div class="col-sm-12" style="text-align:center;">
-                            <button mat-raised-button color="primary" type="button" (click)="duplicateTemplate()">{{lang.duplicate}}</button>
+                            <button *ngIf="!creationMode" mat-raised-button color="primary" type="button" (click)="duplicateTemplate()">{{lang.duplicate}}</button>
                         </div>
                     </div>
                 </form>
@@ -164,4 +159,4 @@
             </mat-list>
         </mat-sidenav>
     </mat-sidenav-container>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/template/controllers/TemplateController.php b/src/app/template/controllers/TemplateController.php
index 3e39844faa28401c11ecdeecac6916cf48b7ab0d..9350e8f617e0d3b0dce8ca792fba2dabed50786f 100644
--- a/src/app/template/controllers/TemplateController.php
+++ b/src/app/template/controllers/TemplateController.php
@@ -56,9 +56,9 @@ class TemplateController
         }
         $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => 'superadmin']);
         foreach ($entities as $key => $entity) {
-            $entities[$key]['selected'] = false;
+            $entities[$key]['state']['selected'] = false;
             if (in_array($entity['id'], $linkedEntities)) {
-                $entities[$key]['selected'] = true;
+                $entities[$key]['state']['selected'] = true;
             }
         }
 
@@ -268,7 +268,7 @@ class TemplateController
 
         $entities = EntityModel::getAllowedEntitiesByUserId(['userId' => 'superadmin']);
         foreach ($entities as $key => $entity) {
-            $entities[$key]['selected'] = false;
+            $entities[$key]['state']['selected'] = false;
         }
 
         return $response->withJson([