diff --git a/common/manager/EventRegistrationManager.php b/common/manager/EventRegistrationManager.php
index 03eca4a..a0bc824 100644
--- a/common/manager/EventRegistrationManager.php
+++ b/common/manager/EventRegistrationManager.php
@@ -186,10 +186,13 @@ class EventRegistrationManager extends BaseObject
      * @return array|EventRegistration|ActiveRecord|null
      * @throws NotFoundHttpException
      */
-    public function loadRegistration($idRegistration)
+    public function loadRegistration($idRegistration, $idCustomer)
     {
 
-        $registration = EventRegistration::find()->andWhere(['id' => $idRegistration])->one();
+        $registration = EventRegistration::find()
+            ->andWhere(['id' => $idRegistration])
+            ->andWhere(['id_customer' => $idCustomer])
+            ->one();
         if ($registration === null) {
             throw new NotFoundHttpException('The requested registration does not exist.');
         }
@@ -200,8 +203,12 @@ class EventRegistrationManager extends BaseObject
      * @param EventRegistration $registration
      * @throws ServerErrorHttpException
      */
-    public function cancelRegistration($registration)
+    public function cancelRegistration($registration, $idCustomer)
     {
+        if ( $registration->id_customer != $idCustomer){
+            throw new NotFoundHttpException('The requested registration does not exist.');
+        }
+
         if (isset($registration->canceled_at)) {
             throw new BadRequestHttpException('The registration is already canceled', self::ALREADY_CANCELLED);
         }
diff --git a/customerapi/controllers/CustomerApiController.php b/customerapi/controllers/CustomerApiController.php
index a0eccc5..c1dd4c1 100644
--- a/customerapi/controllers/CustomerApiController.php
+++ b/customerapi/controllers/CustomerApiController.php
@@ -18,6 +18,4 @@ use yii\web\NotFoundHttpException;
 class CustomerApiController extends RestController
 {
 
-
-
 }
diff --git a/customerapi/controllers/EventController.php b/customerapi/controllers/EventController.php
index 1487828..a02a02f 100644
--- a/customerapi/controllers/EventController.php
+++ b/customerapi/controllers/EventController.php
@@ -122,29 +122,6 @@ class EventController extends \customerapi\controllers\CustomerApiController
             ]);
     }
 
-    /**
-     * @param Query $query
-     * @param $interval
-     * @return Query the query with the added conditions
-     */
-    private function buildEventQuery($query, $interval)
-    {
-
-        $paramEventStartMax =  (clone $interval->lastActiveDate);
-        $paramEventStartMax = $paramEventStartMax->modify('+1 day');
-        $paramEventStartMax = $paramEventStartMax->getTimestamp();
-
-
-        /** @var ActiveQuery $query */
-        return $query
-            ->innerJoinWith('trainer')
-            ->innerJoinWith('eventType')
-            ->innerJoinWith('room')
-            ->joinWith('activeEventRegistrations')
-            ->andWhere(['>=', 'event.start', $interval->firstActiveDate->getTimestamp()])
-            ->andWhere(['<', 'event.start', $paramEventStartMax])
-            ->andWhere(['event.active' => '1']);
-    }
 
     /**
      * @param integer $id_event the id of the event
diff --git a/customerapi/controllers/EventRegistrationController.php b/customerapi/controllers/EventRegistrationController.php
index 1a16d02..cec811d 100644
--- a/customerapi/controllers/EventRegistrationController.php
+++ b/customerapi/controllers/EventRegistrationController.php
@@ -76,9 +76,9 @@ class EventRegistrationController extends CustomerApiController
      */
     public function actionCancel($idRegistration) {
         $manager = new \common\manager\EventRegistrationManager();
-        $registration = $manager->loadRegistration($idRegistration);
-        $manager->cancelRegistration($registration);
-        $registration = $manager->loadRegistration($idRegistration);
+        $registration = $manager->loadRegistration($idRegistration,\Yii::$app->user->id);
+        $manager->cancelRegistration($registration,\Yii::$app->user->id);
+        $registration = $manager->loadRegistration($idRegistration,\Yii::$app->user->id);
         return $this->asJson($registration);
     }
 
diff --git a/customerapi/controllers/SiteController.php b/customerapi/controllers/SiteController.php
index 08ead75..38862a3 100644
--- a/customerapi/controllers/SiteController.php
+++ b/customerapi/controllers/SiteController.php
@@ -38,43 +38,43 @@ class SiteController extends Controller
         ];
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function actions()
-    {
-        return [
-            'error' => [
-                'class' => 'yii\web\ErrorAction',
-            ],
-            'captcha' => [
-                'class' => 'yii\captcha\CaptchaAction',
-                'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
-            ],
-        ];
-    }
+//    /**
+//     * @inheritdoc
+//     */
+//    public function actions()
+//    {
+//        return [
+//            'error' => [
+//                'class' => 'yii\web\ErrorAction',
+//            ],
+//            'captcha' => [
+//                'class' => 'yii\captcha\CaptchaAction',
+//                'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
+//            ],
+//        ];
+//    }
 
-    /**
-     * Displays homepage.
-     *
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        return $this->render('index');
-    }
-
-    /**
-     * Logs out the current user.
-     *
-     * @return mixed
-     */
-    public function actionLogout()
-    {
-        Yii::$app->user->logout();
-
-        return $this->goHome();
-    }
+//    /**
+//     * Displays homepage.
+//     *
+//     * @return mixed
+//     */
+//    public function actionIndex()
+//    {
+//        return $this->render('index');
+//    }
+//
+//    /**
+//     * Logs out the current user.
+//     *
+//     * @return mixed
+//     */
+//    public function actionLogout()
+//    {
+//        Yii::$app->user->logout();
+//
+//        return $this->goHome();
+//    }