diff --git a/frontend/app/scripts/controllers/createTrainingCtrl.js b/frontend/app/scripts/controllers/createTrainingCtrl.js
index 66cbed9..fa4dcc6 100644
--- a/frontend/app/scripts/controllers/createTrainingCtrl.js
+++ b/frontend/app/scripts/controllers/createTrainingCtrl.js
@@ -78,13 +78,20 @@ angular.module('frontendApp')
         for(var i = 0; i < $scope.attachments.length; i++) {
           _.extend($scope.attachments[i], {trainingId : $scope.trainingId});
         }
-        postAttachLinks.save($scope.attachments).$promise.then(function(resp) {
-          uploader.uploadAll();
-          $scope.pendingR = false;
+        if(!_.isEmpty($scope.attachments)) {
+          postAttachLinks.save($scope.attachments).$promise.then(function (resp) {
+            uploader.uploadAll();
+            $scope.pendingR = false;
+            if (_.isEmpty(uploader.queue)) {
+              $location.path('/training/' + $scope.trainingId);
+            }
+          });
+        } else {
           if(_.isEmpty(uploader.queue)) {
             $location.path('/training/' + $scope.trainingId);
           }
-        });
+        }
+
       });
     };
 
@@ -123,7 +130,7 @@ angular.module('frontendApp')
           $scope.users = angular.copy(resp);
         })
       } else {
-        $scope.users = $localStorage.userData;
+        $scope.users.push($localStorage.userData);
       }
 
     }]);
diff --git a/frontend/app/views/popups/leaveTrainingFeedback.html b/frontend/app/views/popups/leaveTrainingFeedback.html
index 2de495f..d266395 100644
--- a/frontend/app/views/popups/leaveTrainingFeedback.html
+++ b/frontend/app/views/popups/leaveTrainingFeedback.html
@@ -3,7 +3,7 @@
     <h2 class="feedback-name">{{translation.LEAVE_TRAINING_FEEDBACK}}</h2>
   </div>
   <div class="modal-body">
-    <form class="form-horizontal" ng-submit="leaveTrainingFeedback()">
+    <form class="form-horizontal">
       <div class="form-group feedbackBlock">
         <div class="col-sm-7 feedback-field control-label">
           <p>{{translation.UNDERSTANDABLE}}</p>
@@ -130,5 +130,5 @@ <h2 class="feedback-name">{{translation.LEAVE_TRAINING_FEEDBACK}}</h2>
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="closeThisDialog()">{{translation.FEEDBACK_CANCEL}}</button>
-  <button type="submit" class="btn btn-primary">{{translation.FEEDBACK_OK}}</button>
+  <button type="button" ng-click="leaveTrainingFeedback()" class="btn btn-primary">{{translation.FEEDBACK_OK}}</button>
 </div>
diff --git a/src/main/java/com/exadel/controller/TrainingPageController.java b/src/main/java/com/exadel/controller/TrainingPageController.java
index d4585e5..3f17d55 100644
--- a/src/main/java/com/exadel/controller/TrainingPageController.java
+++ b/src/main/java/com/exadel/controller/TrainingPageController.java
@@ -289,7 +289,7 @@ public Entry getEntry(@RequestParam String entryId) {
         return entry;
     }
 
-    @PreAuthorize("@trainerControlBean.isTrainer(#trainingDTO) or hasRole('0')")
+    @PreAuthorize("hasRole('0') or @trainerControlBean.isTrainer(#trainingDTO)")
     @RequestMapping(method = RequestMethod.PUT)
     public void modifyTraining(@RequestBody TrainingDTO trainingDTO) {
         Training training = trainingService.getTrainingById(trainingDTO.getId());
diff --git a/src/main/java/com/exadel/controller/TrainingsController.java b/src/main/java/com/exadel/controller/TrainingsController.java
index 6b4761f..052eecf 100644
--- a/src/main/java/com/exadel/controller/TrainingsController.java
+++ b/src/main/java/com/exadel/controller/TrainingsController.java
@@ -8,6 +8,7 @@
 import com.exadel.model.entity.training.Entry;
 import com.exadel.model.entity.training.Training;
 import com.exadel.model.entity.training.TrainingStatus;
+import com.exadel.model.entity.user.ExternalTrainer;
 import com.exadel.model.entity.user.UserRole;
 import com.exadel.search.TrainingSearch;
 import com.exadel.service.EntryService;
@@ -62,7 +63,6 @@ public class TrainingsController {
 
     @PersistenceContext
     private EntityManager entityManager;
-
     @Autowired
     private TrainingFeedbackEventService trainingFeedbackEventService;
     @Autowired
@@ -84,6 +84,8 @@ public List<TrainingDTO> getTrainings() {
     @RequestMapping(value = "/newTraining", method = RequestMethod.POST)   //called only by ADMIN
     public Training createTraining(@RequestBody TrainingDTO trainingDTO) {
         Training training = new Training(trainingDTO);
+        //training.setTrainer(userService.getTrainerById(String.valueOf(trainingDTO.getTrainer().getId())));
+        //training.setTrainer(trainingDTO.getTrainer());
         if (UserUtil.hasRole(0)) {
             training.setStatus(TrainingStatus.APPROVED);
             training = trainingService.addTraining(training);
@@ -91,9 +93,11 @@ public Training createTraining(@RequestBody TrainingDTO trainingDTO) {
         else {
             training.setStatus(TrainingStatus.DRAFTED);
             training = trainingService.addTraining(training);
+            ExternalTrainer t = userService.getTrainerById(String.valueOf(trainingDTO.getTrainer().getId()));
             trainingDTO.setId(training.getId());
-            trainingDTO.setEventDescription(training.getTrainer().getName()+" wants to create a new training \""+training.getName()+"\"");
-            smtpMailSender.sendToUsers(userService.getUsersByRole(UserRole.ADMIN), "Changes in Trainings", emailMessages.newTrainingToAdmin(training));
+            String message = emailMessages.newTrainingToAdmin(training, t);
+            trainingDTO.setEventDescription(t.getName()+" wants to create a new training \""+training.getName()+"\"");
+            smtpMailSender.sendToUsers(userService.getUsersByRole(UserRole.ADMIN), "Changes in Trainings", message);
             trainingEventService.addEvent(new TrainingEvent(trainingDTO));
             List<EventDTO> eventDTOs = new ArrayList<>();
 
diff --git a/src/main/java/com/exadel/service/impl/EmailMessages.java b/src/main/java/com/exadel/service/impl/EmailMessages.java
index 05e7fc1..1a71f11 100644
--- a/src/main/java/com/exadel/service/impl/EmailMessages.java
+++ b/src/main/java/com/exadel/service/impl/EmailMessages.java
@@ -191,9 +191,9 @@ public String lessThanHalf(Training training) {
         return messageSource.getMessage("eventNotification.training.lessThanHalf", arr, null);
     }
 
-    public String newTrainingToAdmin(Training training) {
+    public String newTrainingToAdmin(Training training, ExternalTrainer trainer) {
         Object[] arr = {
-                training.getTrainer().getName(),
+                trainer.getName(),
                 training.getName(),
                 domain + "training/" + training.getId()
         };
diff --git a/src/main/java/com/exadel/service/impl/TrainingServiceImpl.java b/src/main/java/com/exadel/service/impl/TrainingServiceImpl.java
index fb471f3..c739bcf 100644
--- a/src/main/java/com/exadel/service/impl/TrainingServiceImpl.java
+++ b/src/main/java/com/exadel/service/impl/TrainingServiceImpl.java
@@ -88,8 +88,7 @@ public Collection<Training> getAllTrainings() {
 
     @Override
     public Training addTraining(Training training) {
-        trainingRepository.saveAndFlush(training);
-        return training;
+        return trainingRepository.saveAndFlush(training);
     }
 
     @Override