diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index d89d757d..a81a3dab 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -34,8 +34,8 @@ class Package
         $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
         $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->find_one();
 
-        if($c['status'] != 'Active'){
-            _alert(Lang::T('This account status').' : '.Lang::T($c['status']),'danger', "");
+        if ($c['status'] != 'Active') {
+            _alert(Lang::T('This account status') . ' : ' . Lang::T($c['status']), 'danger', "");
         }
 
         $add_cost = 0;
@@ -197,48 +197,29 @@ class Package
                 if ($plan_id != $b['plan_id']) {
                     $isChangePlan = true;
                 }
-                if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') {
-                    // if it same internet plan, expired will extend
-                    if ($p['validity_unit'] == 'Months') {
-                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
-                        $time = $b['time'];
-                    } else if ($p['validity_unit'] == 'Period') {
-                        $date_exp = date("Y-m-$day_exp", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
-                        $time = date("23:59:00");
-                    } else if ($p['validity_unit'] == 'Days') {
-                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
-                        $time = $b['time'];
-                    } else if ($p['validity_unit'] == 'Hrs') {
-                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours')));
-                        $date_exp = $datetime[0];
-                        $time = $datetime[1];
-                    } else if ($p['validity_unit'] == 'Mins') {
-                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes')));
-                        $date_exp = $datetime[0];
-                        $time = $datetime[1];
-                    }
-                } elseif ($b['namebp'] == $p['name_plan'] && $b['status'] == 'off') {
-                    // if it same internet plan but has expired, it will not extend expiry date
-                    if ($p['validity_unit'] == 'Months') {
-                        $date_exp = date("Y-m-d", strtotime($p['validity'] . ' months'));
-                        $time = $b['time'];
-                    } else if ($p['validity_unit'] == 'Period') {
-                        $date_exp = date("Y-m-$day_exp", strtotime($p['validity'] . ' months'));
-                        $time = date("23:59:00");
-                    } else if ($p['validity_unit'] == 'Days') {
-                        $date_exp = date("Y-m-d", strtotime($p['validity'] . ' days'));
-                        $time = $b['time'];
-                    } else if ($p['validity_unit'] == 'Hrs') {
-                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($p['validity'] . ' hours')));
-                        $date_exp = $datetime[0];
-                        $time = $datetime[1];
-                    } else if ($p['validity_unit'] == 'Mins') {
-                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($p['validity'] . ' minutes')));
-                        $date_exp = $datetime[0];
-                        $time = $datetime[1];
+                if ($config['extend_expiry'] === 'yes') {
+                    if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') {
+                        // if it same internet plan, expired will extend
+                        if ($p['validity_unit'] == 'Months') {
+                            $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                            $time = $b['time'];
+                        } else if ($p['validity_unit'] == 'Period') {
+                            $date_exp = date("Y-m-$day_exp", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                            $time = date("23:59:00");
+                        } else if ($p['validity_unit'] == 'Days') {
+                            $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
+                            $time = $b['time'];
+                        } else if ($p['validity_unit'] == 'Hrs') {
+                            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours')));
+                            $date_exp = $datetime[0];
+                            $time = $datetime[1];
+                        } else if ($p['validity_unit'] == 'Mins') {
+                            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes')));
+                            $date_exp = $datetime[0];
+                            $time = $datetime[1];
+                        }
                     }
                 }
-
                 if ($isChangePlan || $b['status'] == 'off') {
                     if ($p['is_radius']) {
                         Radius::customerAddPlan($c, $p, "$date_exp $time");
@@ -418,25 +399,27 @@ class Package
                 if ($plan_id != $b['plan_id']) {
                     $isChangePlan = true;
                 }
-                if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') {
-                    // if it same internet plan, expired will extend
-                    if ($p['validity_unit'] == 'Months') {
-                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
-                        $time = $b['time'];
-                    } else if ($p['validity_unit'] == 'Period') {
-                        $date_exp = date("Y-m-$day_exp", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
-                        $time = date("23:59:00");
-                    } else if ($p['validity_unit'] == 'Days') {
-                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
-                        $time = $b['time'];
-                    } else if ($p['validity_unit'] == 'Hrs') {
-                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours')));
-                        $date_exp = $datetime[0];
-                        $time = $datetime[1];
-                    } else if ($p['validity_unit'] == 'Mins') {
-                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes')));
-                        $date_exp = $datetime[0];
-                        $time = $datetime[1];
+                if ($config['extend_expiry'] === 'yes') {
+                    if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') {
+                        // if it same internet plan, expired will extend
+                        if ($p['validity_unit'] == 'Months') {
+                            $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                            $time = $b['time'];
+                        } else if ($p['validity_unit'] == 'Period') {
+                            $date_exp = date("Y-m-$day_exp", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                            $time = date("23:59:00");
+                        } else if ($p['validity_unit'] == 'Days') {
+                            $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
+                            $time = $b['time'];
+                        } else if ($p['validity_unit'] == 'Hrs') {
+                            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours')));
+                            $date_exp = $datetime[0];
+                            $time = $datetime[1];
+                        } else if ($p['validity_unit'] == 'Mins') {
+                            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes')));
+                            $date_exp = $datetime[0];
+                            $time = $datetime[1];
+                        }
                     }
                 }
 
diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl
index 30ab4c1f..eb3e92dc 100644
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@@ -602,6 +602,18 @@
                         </div>
                         <p class="help-block col-md-4">{Lang::T('The method which OTP will be sent to user')}</p>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Extend Package Expiry')}</label>
+                        <div class="col-md-6">
+                            <select name="extend_expiry" id="extend_expiry" class="form-control">
+                                <option value="no" {if $_c['extend_expiry']=='no' }selected="selected" {/if}>
+                                    {Lang::T('No')}
+                                <option value="yes" {if $_c['extend_expiry']=='yes' }selected="selected"
+                                    {/if}> {Lang::T('Yes')}
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">{Lang::T('If user buy same internet plan, expiry date will extend')}</p>
+                    </div>
                 </div>
 
                  <div class="panel-heading">