diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index 755f1458..2948f8c9 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -546,6 +546,12 @@ class Package
     public static function getDevice($plan)
     {
         global $DEVICE_PATH;
+        if($plan === false){
+            return "none";
+        }
+        if(!isset($plan['device'])){
+            return "none";
+        }
         if (!empty($plan['device'])) {
             return $DEVICE_PATH . DIRECTORY_SEPARATOR . $plan['device'] . '.php';
         }
diff --git a/system/devices/MikrotikHotspot.php b/system/devices/MikrotikHotspot.php
index 170a24f7..63fe2d5b 100644
--- a/system/devices/MikrotikHotspot.php
+++ b/system/devices/MikrotikHotspot.php
@@ -27,8 +27,8 @@ class MikrotikHotspot
         $mikrotik = $this->info($plan['routers']);
         $client = $this->getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
         if (!empty($plan['plan_expired'])) {
-            $p = ORM::for_table("tbl_plans")->select("name_plan")->find_one($plan['plan_expired']);
-            $this->setHotspotUserPackage($client, $customer['username'], $p['name_plan']);
+            $p = ORM::for_table("tbl_plans")->find_one($plan['plan_expired']);
+            $this->add_customer($customer, $p);
         } else {
             $this->removeHotspotUser($client, $customer['username']);
         }
@@ -280,7 +280,7 @@ class MikrotikHotspot
         $client->sendSync($setRequest);
     }
 
-    function setHotspotUserPackage($client, $user, $plan_name)
+    function setHotspotUserPackage($client, $username, $plan_name)
     {
         global $_app_stage;
         if ($_app_stage == 'demo') {
@@ -288,7 +288,7 @@ class MikrotikHotspot
         }
         $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
         $printRequest->setArgument('.proplist', '.id');
-        $printRequest->setQuery(RouterOS\Query::where('name', $user));
+        $printRequest->setQuery(RouterOS\Query::where('name', $username));
         $id = $client->sendSync($printRequest)->getProperty('.id');
 
         $setRequest = new RouterOS\Request('/ip/hotspot/user/set');
diff --git a/system/devices/MikrotikPppoe.php b/system/devices/MikrotikPppoe.php
index 46afa880..b9817a7d 100644
--- a/system/devices/MikrotikPppoe.php
+++ b/system/devices/MikrotikPppoe.php
@@ -27,8 +27,8 @@ class MikrotikPppoe
         $mikrotik = $this->info($plan['routers']);
         $client = $this->getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
         if (!empty($plan['plan_expired'])) {
-            $p = ORM::for_table("tbl_plans")->select("name_plan")->find_one($plan['plan_expired']);
-            $this->setPpoeUserPlan($client, $customer['username'], $p['plan_expired']);
+            $p = ORM::for_table("tbl_plans")->find_one($plan['plan_expired']);
+            $this->add_customer($customer, $p);
         } else {
             $this->removePpoeUser($client, $customer['username']);
         }
diff --git a/system/devices/Radius.php b/system/devices/Radius.php
index 5c4fb2f1..080d242e 100644
--- a/system/devices/Radius.php
+++ b/system/devices/Radius.php
@@ -18,9 +18,9 @@ class Radius {
 
     function remove_customer($customer, $plan)
     {
-        if (empty($plan['plan_expired'])) {
+        if (!empty($plan['plan_expired'])) {
             $p = ORM::for_table("tbl_plans")->find_one($plan['plan_expired']);
-            $this->customerAddPlan($customer, $plan);
+            $this->customerAddPlan($customer, $p);
         } else {
             $this->customerDeactivate($customer['username'], true);
         }
diff --git a/system/lan/indonesia.json b/system/lan/indonesia.json
index 1a1e1cf5..aabce314 100644
--- a/system/lan/indonesia.json
+++ b/system/lan/indonesia.json
@@ -522,5 +522,10 @@
     "Ascending": "Naik",
     "Descending": "Menurun",
     "Query": "Query",
-    "Add": "Menambahkan"
+    "Add": "Menambahkan",
+    "Logout_Successful": "Logout Berhasil",
+    "warning": "peringatan",
+    "Created___Expired": "Dibuat \/ Kedaluwarsa",
+    "Login___Activate_Voucher": "Masuk \/ Aktifkan Voucher",
+    "Voucher_activation_success__now_you_can_login": "Aktivasi voucher berhasil, sekarang Anda dapat login"
 }
\ No newline at end of file
diff --git a/ui/ui/plan.tpl b/ui/ui/plan.tpl
index cd9fc723..3c63e550 100644
--- a/ui/ui/plan.tpl
+++ b/ui/ui/plan.tpl
@@ -86,7 +86,11 @@
                         {foreach $d as $ds}
                             <tr {if $ds['status']=='off'}class="danger" {/if}>
                                 <td><a href="{$_url}customers/viewu/{$ds['username']}">{$ds['username']}</a></td>
-                                <td>{$ds['namebp']}</td>
+                                {if $ds['type'] == 'Hotspot'}
+                                    <td><a href="{$_url}services/edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
+                                {else}
+                                    <td><a href="{$_url}services/pppoe-edit/{$ds['plan_id']}">{$ds['namebp']}</a></td>
+                                {/if}
                                 <td>{$ds['type']}</td>
                                 <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
                                 <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>