diff --git a/src/User/Bootstrap.php b/src/User/Bootstrap.php
index a40200f..4ad380f 100644
--- a/src/User/Bootstrap.php
+++ b/src/User/Bootstrap.php
@@ -25,7 +25,7 @@ use yii\console\Application as ConsoleApplication;
 use yii\i18n\PhpMessageSource;
 use yii\web\Application as WebApplication;
 
-use yii\base\Event;
+use yii\base\Event as YiiEvent;
 use Da\User\Event\FormEvent;
 use Da\User\Controller\SecurityController;
 
@@ -153,7 +153,7 @@ class Bootstrap implements BootstrapInterface
 
             // Attach an event to check if the password has expired
             if (!is_null(Yii::$app->getModule('user')->maxPasswordAge)) {
-                Event::on(SecurityController::class, FormEvent::EVENT_AFTER_LOGIN, function (FormEvent $event) {
+                YiiEvent::on(SecurityController::class, FormEvent::EVENT_AFTER_LOGIN, function (FormEvent $event) {
                     $user = $event->form->user;
                     if ($user->password_age >= Yii::$app->getModule('user')->maxPasswordAge) {
                         // Force password change
diff --git a/src/User/Event/FormEvent.php b/src/User/Event/FormEvent.php
index ccefc16..1f1f525 100644
--- a/src/User/Event/FormEvent.php
+++ b/src/User/Event/FormEvent.php
@@ -14,6 +14,12 @@ namespace Da\User\Event;
 use yii\base\Event;
 use yii\base\Model;
 
+/**
+ * Class FormEvent
+ * @package Da\User\Event
+ *
+ * @property Model $form
+ */
 class FormEvent extends Event
 {
     const EVENT_BEFORE_REQUEST = 'beforeRequest';
diff --git a/src/User/Event/GdprEvent.php b/src/User/Event/GdprEvent.php
index 89872c5..4fd532a 100644
--- a/src/User/Event/GdprEvent.php
+++ b/src/User/Event/GdprEvent.php
@@ -14,6 +14,12 @@ namespace Da\User\Event;
 use Da\User\Model\User;
 use yii\base\Event;
 
+/**
+ * Class GdprEvent
+ * @package Da\User\Event
+ *
+ * @property User $user
+ */
 class GdprEvent extends Event
 {
 
diff --git a/src/User/Event/MailEvent.php b/src/User/Event/MailEvent.php
index 8ebe5f8..51bf9bf 100644
--- a/src/User/Event/MailEvent.php
+++ b/src/User/Event/MailEvent.php
@@ -15,6 +15,15 @@ use Da\User\Model\User;
 use Da\User\Service\MailService;
 use yii\base\Event;
 
+/**
+ * Class MailEvent
+ * @package Da\User\Event
+ *
+ * @property string $type
+ * @property User $user
+ * @property MailService $mailService
+ * @property mixed|\Exception $exception
+ */
 class MailEvent extends Event
 {
     const TYPE_WELCOME = 'welcome';
diff --git a/src/User/Event/ProfileEvent.php b/src/User/Event/ProfileEvent.php
index 902c276..05af532 100644
--- a/src/User/Event/ProfileEvent.php
+++ b/src/User/Event/ProfileEvent.php
@@ -14,6 +14,12 @@ namespace Da\User\Event;
 use Da\User\Model\Profile;
 use yii\base\Event;
 
+/**
+ * Class ProfileEvent
+ * @package Da\User\Event
+ *
+ * @property Profile $profile
+ */
 class ProfileEvent extends Event
 {
     protected $profile;
diff --git a/src/User/Event/ResetPasswordEvent.php b/src/User/Event/ResetPasswordEvent.php
index 4cc21d0..906099f 100644
--- a/src/User/Event/ResetPasswordEvent.php
+++ b/src/User/Event/ResetPasswordEvent.php
@@ -15,6 +15,13 @@ use Da\User\Form\RecoveryForm;
 use Da\User\Model\Token;
 use yii\base\Event;
 
+/**
+ * Class ResetPasswordEvent
+ * @package Da\User\Event
+ *
+ * @property Token $token
+ * @property RecoveryForm $form
+ */
 class ResetPasswordEvent extends Event
 {
     const EVENT_BEFORE_TOKEN_VALIDATE = 'beforeTokenValidate';
diff --git a/src/User/Event/SocialNetworkAuthEvent.php b/src/User/Event/SocialNetworkAuthEvent.php
index a126e24..5ac1ed3 100644
--- a/src/User/Event/SocialNetworkAuthEvent.php
+++ b/src/User/Event/SocialNetworkAuthEvent.php
@@ -15,6 +15,13 @@ use Da\User\Model\SocialNetworkAccount;
 use yii\authclient\ClientInterface;
 use yii\base\Event;
 
+/**
+ * Class SocialNetworkAuthEvent
+ * @package Da\User\Event
+ *
+ * @property SocialNetworkAccount $account
+ * @property ClientInterface $client
+ */
 class SocialNetworkAuthEvent extends Event
 {
     const EVENT_BEFORE_AUTHENTICATE = 'beforeAuthenticate';
diff --git a/src/User/Event/SocialNetworkConnectEvent.php b/src/User/Event/SocialNetworkConnectEvent.php
index 5f28201..50e685a 100644
--- a/src/User/Event/SocialNetworkConnectEvent.php
+++ b/src/User/Event/SocialNetworkConnectEvent.php
@@ -15,6 +15,13 @@ use Da\User\Model\SocialNetworkAccount;
 use Da\User\Model\User;
 use yii\base\Event;
 
+/**
+ * Class SocialNetworkConnectEvent
+ * @package Da\User\Event
+ *
+ * @property User $user
+ * @property SocialNetworkAccount $account
+ */
 class SocialNetworkConnectEvent extends Event
 {
     const EVENT_BEFORE_CONNECT = 'beforeConnect';
diff --git a/src/User/Event/UserEvent.php b/src/User/Event/UserEvent.php
index d8f032e..a68c5ab 100644
--- a/src/User/Event/UserEvent.php
+++ b/src/User/Event/UserEvent.php
@@ -14,6 +14,12 @@ namespace Da\User\Event;
 use Da\User\Model\User;
 use yii\base\Event;
 
+/**
+ * Class UserEvent
+ * @package Da\User\Event
+ *
+ * @property User $user
+ */
 class UserEvent extends Event
 {
     const EVENT_BEFORE_CREATE = 'beforeCreate';