diff --git a/app/Filament/Resources/User/UserResource/Pages/UserProfile.php b/app/Filament/Resources/User/UserResource/Pages/UserProfile.php
index dfec0818..5a45a121 100644
--- a/app/Filament/Resources/User/UserResource/Pages/UserProfile.php
+++ b/app/Filament/Resources/User/UserResource/Pages/UserProfile.php
@@ -278,11 +278,6 @@ class UserProfile extends ViewRecord
             ->action(function ($data) {
                 $rep = $this->getRep();
                 try {
-                    if (!empty($data['duration'])) {
-                        $data['deadline'] = now()->addDays($data['duration']);
-                    } else {
-                        $data['deadline'] = null;
-                    }
                     $rep->addMeta($this->record, $data, $data);
                     $this->notify('success', 'Success!');
                     $this->emitSelf(self::EVENT_RECORD_UPDATED, $this->record->id);
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index a72290f5..b2b37efa 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -467,23 +467,41 @@ class UserRepository extends BaseRepository
         $user = $this->getUser($user);
         $metaKey = $metaData['meta_key'];
         $allowMultiple = UserMeta::$metaKeys[$metaKey]['multiple'];
+        $log = "user: {$user->id}, metaKey: $metaKey, allowMultiple: $allowMultiple";
         if ($allowMultiple) {
             //Allow multiple, just insert
             $result = $user->metas()->create($metaData);
+            $log .= ", allowMultiple, just insert";
         } else {
             $metaExists = $user->metas()->where('meta_key', $metaKey)->first();
+            $log .= ", metaExists: " . ($metaExists->id ?? '');
             if (!$metaExists) {
                 $result = $user->metas()->create($metaData);
+                $log .= ", meta not exists, just create";
             } else {
-                if (empty($keyExistsUpdates)) {
-                    $keyExistsUpdates = ['updated_at' => now()];
+                $log .= ", meta exists";
+                $keyExistsUpdates['updated_at'] = now();
+                if (!empty($keyExistsUpdates['duration'])) {
+                    $log .= ", has duration: {$keyExistsUpdates['duration']}";
+                    if ($metaExists->deadline && $metaExists->deadline->gte(now())) {
+                        $log .= ", not expire";
+                        $keyExistsUpdates['deadline'] = $metaExists->deadline->addDays($keyExistsUpdates['duration']);
+                    } else {
+                        $log .= ", expired or not set";
+                        $keyExistsUpdates['deadline'] = now()->addDays($keyExistsUpdates['duration']);
+                    }
+                    unset($keyExistsUpdates['duration']);
+                } else {
+                    $keyExistsUpdates['deadline'] = null;
                 }
+                $log .= ", update: " . json_encode($keyExistsUpdates);
                 $result = $metaExists->update($keyExistsUpdates);
             }
         }
         if ($result) {
             clear_user_cache($user->id, $user->passkey);
         }
+        do_log($log);
         return $result;
     }
 
diff --git a/include/constants.php b/include/constants.php
index 67c10ccb..ae443d6e 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.29');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-10-09');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-10-10');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");