diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index 9c9065b9..bad20540 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -101,6 +101,7 @@ class RestAuthenticationController extends AdminController
                                     ->where('employees.mobile', $mobile_number)
                                     ->where('EP.is_active', 1)
                                     ->whereIn('EP.status', ['active', 'expired'])
+                                    ->orderBy('employees.id', 'desc')
                                     ->first();
 
             $lastQuery = $this->employeeModel->db->getLastQuery();
@@ -122,7 +123,7 @@ class RestAuthenticationController extends AdminController
                     AND employees.relationship = 'self'
                     AND employees.is_active = 1
                     AND employee_polices.is_active = 1
-                    AND employee_polices.status IN ('active')
+                    AND employee_polices.status IN ('active', 'expired')
                 ";
 
                 $db = db_connect();
@@ -166,7 +167,7 @@ class RestAuthenticationController extends AdminController
             log_message('error', '  ');
             log_message('error', ' ************************************* POST END **************************************** ');
             log_message('error', '  ');
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => $th->getMessage()],500);
         }
     }