diff --git a/framework/core/src/Core/Users/Commands/EditUserHandler.php b/framework/core/src/Core/Users/Commands/EditUserHandler.php
index 5517bd30e..477b842a5 100644
--- a/framework/core/src/Core/Users/Commands/EditUserHandler.php
+++ b/framework/core/src/Core/Users/Commands/EditUserHandler.php
@@ -65,7 +65,7 @@ class EditUserHandler
             }
         }
 
-        event(new UserWillBeSaved($actor, $actor, $data));
+        event(new UserWillBeSaved($user, $actor, $data));
 
         $user->save();
         $this->dispatchEventsFor($user);
diff --git a/framework/core/src/Core/Users/PasswordToken.php b/framework/core/src/Core/Users/PasswordToken.php
index 354875189..df810d5bb 100644
--- a/framework/core/src/Core/Users/PasswordToken.php
+++ b/framework/core/src/Core/Users/PasswordToken.php
@@ -12,6 +12,11 @@ class PasswordToken extends Model
      */
     protected $table = 'password_tokens';
 
+    /**
+     * {@inheritdoc}
+     */
+    public $dates = ['created_at'];
+
     /**
      * Use a custom primary key for this model.
      *