diff --git a/system/autoload/Message.php b/system/autoload/Message.php
index dd7cf72c..aef2f3c9 100644
--- a/system/autoload/Message.php
+++ b/system/autoload/Message.php
@@ -191,14 +191,14 @@ class Message
 
         if (strpos($msg, '[[payment_link]]') !== false) {
             // token only valid for 1 day, for security reason
-            list($time, $token) = User::generateToken($customer['id'], 1);
-            if(!empty($token)){
+            $token = User::generateToken($customer['id'], 1);
+            if(!empty($token['token'])){
                 $tur = ORM::for_table('tbl_user_recharges')
                     ->where('customer_id', $customer['id'])
                     ->where('namebp', $package)
                     ->find_one();
                 if ($tur) {
-                    $url = '?_route=home&recharge=' . $tur['id'] . '&uid=' . urlencode($token);
+                    $url = '?_route=home&recharge=' . $tur['id'] . '&uid=' . urlencode($token['token']);
                     $msg = str_replace('[[payment_link]]', $url, $msg);
                 }
             }else{
diff --git a/system/autoload/User.php b/system/autoload/User.php
index d0dd08d8..d1e0b7ff 100644
--- a/system/autoload/User.php
+++ b/system/autoload/User.php
@@ -177,8 +177,8 @@ class User
     {
         global $db_pass;
         if (isset($uid)) {
-            list($time, $token) = self::generateToken($uid);
-            setcookie('uid', $token, time() + 86400 * 30);
+            $token = self::generateToken($uid);
+            setcookie('uid', $token['token'], time() + 86400 * 30);
             return $token;
         } else {
             return false;