diff --git a/app/assets/javascripts/controllers/admin/trainings.coffee.erb b/app/assets/javascripts/controllers/admin/trainings.coffee.erb
index f5d9d7cce..fcd583861 100644
--- a/app/assets/javascripts/controllers/admin/trainings.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/trainings.coffee.erb
@@ -5,7 +5,7 @@
 ##
 # Controller used in the training creation page (admin)
 ##
-Application.Controllers.controller "NewTrainingController", [ '$scope', ($scope) ->
+Application.Controllers.controller "NewTrainingController", [ '$scope', 'machinesPromise', ($scope, machinesPromise) ->
 
 
 
@@ -17,6 +17,9 @@ Application.Controllers.controller "NewTrainingController", [ '$scope', ($scope)
   ## API URL where the form will be posted
   $scope.actionUrl = '/api/trainings'
 
+  ## list of machines
+  $scope.machines = machinesPromise
+
   ##
   # For use with 'ng-class', returns the CSS class name for the uploads previews.
   # The preview may show a placeholder or the content of the file depending on the upload state.
@@ -34,7 +37,7 @@ Application.Controllers.controller "NewTrainingController", [ '$scope', ($scope)
 ##
 # Controller used in the training edition page (admin)
 ##
-Application.Controllers.controller "EditTrainingController", [ '$scope', '$stateParams', 'trainingPromise',  ($scope, $stateParams, trainingPromise) ->
+Application.Controllers.controller "EditTrainingController", [ '$scope', '$stateParams', 'trainingPromise', 'machinesPromise', ($scope, $stateParams, trainingPromise, machinesPromise) ->
 
 
 
@@ -49,6 +52,9 @@ Application.Controllers.controller "EditTrainingController", [ '$scope', '$state
   ## Details of the training to edit (id in URL)
   $scope.training = trainingPromise
 
+  ## list of machines
+  $scope.machines = machinesPromise
+
   ##
   # For use with 'ng-class', returns the CSS class name for the uploads previews.
   # The preview may show a placeholder or the content of the file depending on the upload state.
diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb
index 5c9db9555..d3fb4bb84 100644
--- a/app/assets/javascripts/router.coffee.erb
+++ b/app/assets/javascripts/router.coffee.erb
@@ -530,6 +530,9 @@ angular.module('application.router', ['ui.router']).
             templateUrl: '<%= asset_path "admin/trainings/new.html" %>'
             controller: 'NewTrainingController'
         resolve:
+          machinesPromise: ['Machine', (Machine)->
+            Machine.query().$promise
+          ]
           translations: [ 'Translations', (Translations) ->
             Translations.query(['app.admin.trainings_new', 'app.shared.trainings']).$promise
           ]
@@ -543,6 +546,9 @@ angular.module('application.router', ['ui.router']).
           trainingPromise: ['Training', '$stateParams', (Training, $stateParams)->
             Training.get(id: $stateParams.id).$promise
           ]
+          machinesPromise: ['Machine', (Machine)->
+            Machine.query().$promise
+          ]
           translations: [ 'Translations', (Translations) ->
             Translations.query('app.shared.trainings').$promise
           ]
diff --git a/app/assets/templates/admin/trainings/_form.html.erb b/app/assets/templates/admin/trainings/_form.html.erb
index e47dff573..3c4b6044b 100644
--- a/app/assets/templates/admin/trainings/_form.html.erb
+++ b/app/assets/templates/admin/trainings/_form.html.erb
@@ -51,6 +51,35 @@
       </div>
     </div>
 
+    <div class="form-group m-b-lg" ng-class="{'has-error': trainingForm['training[machine_ids]'].$dirty && trainingForm['training[machine_ids]'].$invalid}">
+      <label for="name" class="col-sm-2 control-label">{{ 'associated_machines' | translate }}</label>
+      <div class="col-sm-4">
+        <input type="hidden"
+               value="{{training.machine_ids}}"
+               name="training[machine_ids][]">
+        <ui-select multiple ng-model="training.machine_ids" name="training[machine_ids][]" class="form-control">
+          <ui-select-match>
+            <span ng-bind="$item.name"></span>
+            <input type="hidden" name="training[machine_ids][]" value="{{$item.id}}" />
+          </ui-select-match>
+          <ui-select-choices repeat="m.id as m in (machines | filter: $select.search)">
+            <span ng-bind-html="m.name | highlight: $select.search"></span>
+          </ui-select-choices>
+        </ui-select>
+      </div>
+    </div>
+
+    <div class="form-group m-b-lg" ng-class="{'has-error': trainingForm['training[nb_total_places]'].$dirty && trainingForm['training[nb_total_places]'].$invalid}">
+      <label for="name" class="col-sm-2 control-label">{{ 'number_of_tickets' | translate }}</label>
+      <div class="col-sm-4">
+        <input ng-model="training.nb_total_places"
+               type="number"
+               name="training[nb_total_places]"
+               class="form-control"
+               id="training_nb_total_places">
+      </div>
+    </div>
+
   </div>   <!-- ./panel-body  -->
 
   <div class="panel-footer no-padder">
diff --git a/app/assets/templates/admin/trainings/edit.html.erb b/app/assets/templates/admin/trainings/edit.html.erb
index b0ee69b4d..55cd89b48 100644
--- a/app/assets/templates/admin/trainings/edit.html.erb
+++ b/app/assets/templates/admin/trainings/edit.html.erb
@@ -4,7 +4,7 @@
     <div class="row no-gutter">
       <div class="col-xs-2 col-sm-2 col-md-1">
         <section class="heading-btn">
-          <a ng-click="cancel()"><i class="fa fa-long-arrow-left"></i></a>
+          <a ng-click="backPrevLocation($event)"><i class="fa fa-long-arrow-left"></i></a>
         </section>
       </div>
       <div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
@@ -15,7 +15,7 @@
 
       <div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md">
         <section class="heading-actions wrapper">
-         <div class="btn btn-lg btn-block btn-default rounded m-t-xs" ng-click="cancel()" translate>{{ 'cancel' }}</div>
+         <div class="btn btn-lg btn-block btn-default rounded m-t-xs" ng-click="backPrevLocation($event)" translate>{{ 'cancel' }}</div>
         </section>
       </div>
     </div>
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml
index 605aa382c..a335903fb 100644
--- a/config/locales/app.admin.en.yml
+++ b/config/locales/app.admin.en.yml
@@ -46,8 +46,6 @@ en:
 
       trainings:
         # track and monitor the trainings
-        associated_machines: "Associated machines"
-        number_of_tickets: "Number of tickets"
         training: "Training"
         year_NUMBER: "Year {{NUMBER}}"  # angular interpolation
         month_of_NAME: "Month of {{NAME}}"  # angular interpolation
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 31169d4a5..e9e64e2e2 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -46,8 +46,6 @@ fr:
 
       trainings:
         # suivre et surveiller les formations
-        associated_machines: "Machines associées"
-        number_of_tickets: "Nombre de places"
         training: "Formation"
         year_NUMBER: "Année {{NUMBER}}"  # angular interpolation
         month_of_NAME: "Mois de {{NAME}}"  # angular interpolation
diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml
index 2aefb1531..325f1e45b 100644
--- a/config/locales/app.shared.en.yml
+++ b/config/locales/app.shared.en.yml
@@ -215,6 +215,8 @@ en:
         # training edition form
         add_a_new_training: "Add a new training"
         validate_your_training: "Validate your training"
+        associated_machines: "Associated machines"
+        number_of_tickets: "Number of tickets"
 
       user_admin:
         # partial form to edit/create an user (admin view)
diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml
index 31998b6c6..329d7d3ed 100644
--- a/config/locales/app.shared.fr.yml
+++ b/config/locales/app.shared.fr.yml
@@ -215,6 +215,8 @@ fr:
         # formulaire d'édition d'une formation
         add_a_new_training: "Ajouter une nouvelle formation"
         validate_your_training: "Valider votre formation"
+        associated_machines: "Machines associées"
+        number_of_tickets: "Nombre de places"
 
       user_admin:
         # formulaire partiel d'édition/création utilisateur (vue admin)