diff --git a/src/app/Observers/UserObserver.php b/src/app/Observers/UserObserver.php
index 4da153b..c8b7451 100644
--- a/src/app/Observers/UserObserver.php
+++ b/src/app/Observers/UserObserver.php
@@ -13,6 +13,7 @@ class UserObserver
     public function updating($user): void
     {
         PasswordHistoryManager::logPassword($user);
+        $this->updateExpireColumn($user);
     }
 
     /**
@@ -25,6 +26,15 @@ class UserObserver
     }
 
     public function creating($user): void
+    {
+        $this->updateExpireColumn($user);
+    }
+
+    /**
+     * @param $user
+     * @return void
+     */
+    private function updateExpireColumn($user): void
     {
         $expiresAtColumn = config('ae3auth-config.user.expires_password_column_name');
         $user->$expiresAtColumn = now()->addDays(config('ae3auth-config.password_expires_in'));