diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index 81483e44..7970a76d 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -809,10 +809,14 @@ switch ($action) {
             $query = ORM::for_table('tbl_customers');
             $query->where("status", $filter);
         }
-        if ($orderby == 'asc') {
-            $query->order_by_asc($order);
-        } else {
-            $query->order_by_desc($order);
+        if($order == 'lastname') {
+            $query->order_by_expr("SUBSTR(fullname, INSTR(fullname, ' ')) $orderby");
+        }else{
+            if ($orderby == 'asc') {
+                $query->order_by_asc($order);
+            } else {
+                $query->order_by_desc($order);
+            }
         }
         if (_post('export', '') == 'csv') {
             $csrf_token = _post('csrf_token');
diff --git a/system/lan/indonesia.json b/system/lan/indonesia.json
index 891a74be..af228277 100644
--- a/system/lan/indonesia.json
+++ b/system/lan/indonesia.json
@@ -825,5 +825,7 @@
     "radius": "radius",
     "Max_30_days": "Maksimal 30 hari",
     "Information": "Informasi",
-    "Export_and_Print_will_show_all_data_without_pagination": "Ekspor dan Cetak akan menampilkan semua data tanpa pagination"
+    "Export_and_Print_will_show_all_data_without_pagination": "Ekspor dan Cetak akan menampilkan semua data tanpa pagination",
+    "First_Name": "Nama depan",
+    "Last_Name": "Nama Belakang"
 }
\ No newline at end of file
diff --git a/ui/ui/customers.tpl b/ui/ui/customers.tpl
index 6d2a95a0..6f2a483a 100644
--- a/ui/ui/customers.tpl
+++ b/ui/ui/customers.tpl
@@ -36,6 +36,10 @@
                                         <select class="form-control" id="order" name="order">
                                             <option value="username" {if $order eq 'username' }selected{/if}>
                                                 {Lang::T('Username')}</option>
+                                            <option value="fullname" {if $order eq 'fullname' }selected{/if}>
+                                                {Lang::T('First Name')}</option>
+                                            <option value="lastname" {if $order eq 'lastname' }selected{/if}>
+                                                {Lang::T('Last Name')}</option>
                                             <option value="created_at" {if $order eq 'created_at' }selected{/if}>
                                                 {Lang::T('Created Date')}</option>
                                             <option value="balance" {if $order eq 'balance' }selected{/if}>
@@ -68,15 +72,12 @@
                         </div>
                         <div class="col-lg-4">
                             <div class="input-group">
-                                <div class="input-group-addon">
-                                    <span class="fa fa-search"></span>
-                                </div>
                                 <input type="text" name="search" class="form-control"
                                     placeholder="{Lang::T('Search')}..." value="{$search}">
                                 <div class="input-group-btn">
                                     <button class="btn btn-primary" type="submit"><span
-                                            class="fa fa-search"></span></button>
-                                    <button class="btn btn-primary" type="submit" name="export" value="csv">
+                                            class="fa fa-search"></span> {Lang::T('Search')}</button>
+                                    <button class="btn btn-info" type="submit" name="export" value="csv">
                                         <span class="glyphicon glyphicon-download" aria-hidden="true"></span> CSV
                                     </button>
                                 </div>
diff --git a/version.json b/version.json
index a69b849f..fd33047e 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.10.31"
+    "version": "2024.11.1"
 }
\ No newline at end of file