diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index 49ab694..a33df78 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -30,7 +30,7 @@ class Package
         }
 
         $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
-        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one();
         if ($p['validity_unit'] == 'Period') {
             $f = ORM::for_table('tbl_customers_fields')->where('field_name', 'Expired Date')->where('customer_id', $c['id'])->find_one();
             if (!$f) {
@@ -511,7 +511,7 @@ class Package
     public static function changeTo($username, $plan_id, $from_id)
     {
         $c = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
-        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one();
         $b = ORM::for_table('tbl_user_recharges')->find_one($from_id);
         if ($p['routers'] == $b['routers'] && $b['routers'] != 'radius') {
             $mikrotik = Mikrotik::info($p['routers']);
diff --git a/system/controllers/autoload.php b/system/controllers/autoload.php
index 3a4ce34..546473a 100644
--- a/system/controllers/autoload.php
+++ b/system/controllers/autoload.php
@@ -38,10 +38,18 @@ switch ($action) {
     case 'plan':
         $server = _post('server');
         $jenis = _post('jenis');
-        if($server=='radius'){
-            $d = ORM::for_table('tbl_plans')->where('is_radius', 1)->where('type', $jenis)->where('enabled', '1')->find_many();
+        if(in_array($admin['user_type'], array('SuperAdmin', 'Admin'))){
+            if($server=='radius'){
+                $d = ORM::for_table('tbl_plans')->where('is_radius', 1)->where('type', $jenis)->find_many();
+            }else{
+                $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->find_many();
+            }
         }else{
-            $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->where('enabled', '1')->find_many();
+            if($server=='radius'){
+                $d = ORM::for_table('tbl_plans')->where('is_radius', 1)->where('type', $jenis)->where('enabled', '1')->find_many();
+            }else{
+                $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->where('enabled', '1')->find_many();
+            }
         }
         $ui->assign('d', $d);
 
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index fb81018..18f99ca 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -89,10 +89,6 @@ switch ($action) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         $ui->assign('xfooter', $select2_customer);
-        $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many();
-        $ui->assign('p', $p);
-        $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many();
-        $ui->assign('r', $r);
         if (isset($routes['2']) && !empty($routes['2'])) {
             $ui->assign('cust', ORM::for_table('tbl_customers')->find_one($routes['2']));
         }
@@ -193,7 +189,11 @@ switch ($action) {
         $d = ORM::for_table('tbl_user_recharges')->find_one($id);
         if ($d) {
             $ui->assign('d', $d);
-            $p = ORM::for_table('tbl_plans')->where('enabled', '1')->where_not_equal('type', 'Balance')->find_many();
+            if(in_array($admin['user_type'], array('SuperAdmin', 'Admin'))){
+                $p = ORM::for_table('tbl_plans')->where_not_equal('type', 'Balance')->find_many();
+            }else{
+                $p = ORM::for_table('tbl_plans')->where('enabled', '1')->where_not_equal('type', 'Balance')->find_many();
+            }
             $ui->assign('p', $p);
             run_hook('view_edit_customer_plan'); #HOOK
             $ui->assign('_title', 'Edit Plan');
diff --git a/ui/ui/autoload.tpl b/ui/ui/autoload.tpl
index 86f0d74..caeff1a 100644
--- a/ui/ui/autoload.tpl
+++ b/ui/ui/autoload.tpl
@@ -1,4 +1,4 @@
 <option value="">Select Plans</option>
 {foreach $d as $ds}
-	<option value="{$ds['id']}">{$ds['name_plan']} &bull; {Lang::moneyFormat($ds['price'])}</option>
+<option value="{$ds['id']}">{if $ds['enabled'] neq 1}DISABLED PLAN &bull; {/if}{$ds['name_plan']} &bull; {Lang::moneyFormat($ds['price'])}</option>
 {/foreach}
\ No newline at end of file
diff --git a/ui/ui/prepaid-edit.tpl b/ui/ui/prepaid-edit.tpl
index 0fe23a1..ce98b57 100644
--- a/ui/ui/prepaid-edit.tpl
+++ b/ui/ui/prepaid-edit.tpl
@@ -23,7 +23,8 @@
                             <select id="id_plan" name="id_plan" class="form-control select2">
                                 {foreach $p as $ps}
                                     <option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>
-                                    {if $ps['is_radius']=='1'}Radius{else}{$ps['routers']}{/if} - {$ps['name_plan']}</option>
+                                    {if $ps['enabled'] neq 1}DISABLED PLAN &bull; {/if}
+                                    {if $ps['is_radius']=='1'}Radius{else}{$ps['routers']}{/if} &bull; {$ps['name_plan']}</option>
                                 {/foreach}
                             </select>
                         </div>