diff --git a/get_settings.php b/get_settings.php
index 37265ebd..7aac52cd 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -946,7 +946,7 @@ $software_types_array = array(
     'Mobile',
     'System Software',
     'Operating System',
-    'Other'
+    'Misc'
 );
 
 $license_types_array = array(
@@ -964,7 +964,8 @@ $asset_status_array = array(
     'Ready to Deploy',
     'Deployed',
     'Out for Repair',
-    'Lost/Stolen',
+    'Lost',
+    'Stolen',
     'Retired'
 );
 
diff --git a/ticket.php b/ticket.php
index 6f5ec74a..eac420e7 100644
--- a/ticket.php
+++ b/ticket.php
@@ -295,9 +295,11 @@ if (isset($_GET['ticket_id'])) {
                                             <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
                                         </div>
                                         <select class="form-control select2" name="status" required>
-                                            <option <?php if ($ticket_status == 'Open') { echo "selected"; } ?> >Open</option>
-                                            <option <?php if ($ticket_status == 'Working') { echo "selected"; } ?> >Working</option>
-                                            <option <?php if ($ticket_status == 'On Hold') { echo "selected"; } ?> >On Hold</option>
+                                            <option <?php if ($ticket_status == "In-Progress") {echo "selected";}?> >In-Progress</option>
+                                            <option <?php if ($ticket_status == "Pending-Client") {echo "selected";}?> >Pending-Client</option>
+                                            <option <?php if ($ticket_status == "Pending-Vendor") {echo "selected";}?> >Pending-Vendor</option>
+                                            <option <?php if ($ticket_status == "Pending-Shipment") {echo "selected";}?> >Pending-Shipment</option>
+                                            <option <?php if ($ticket_status == "Scheduled") {echo "selected";}?> >Scheduled</option>
                                             <?php if($config_ticket_autoclose) { ?>
                                                 <option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
                                             <?php } ?>
diff --git a/tickets.php b/tickets.php
index c092467e..6294d223 100644
--- a/tickets.php
+++ b/tickets.php
@@ -14,6 +14,21 @@ if (!isset($_GET['status'])) {
 } elseif (isset($_GET['status']) && ($_GET['status']) == 'Open') {
     $status = 'Open';
     $ticket_status_snippet = "ticket_status != 'Closed'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'In-Progress') {
+    $status = 'In-Progress';
+    $ticket_status_snippet = "ticket_status = 'In-Progress'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Pending-Client') {
+    $status = 'Pending-Client';
+    $ticket_status_snippet = "ticket_status = 'Pending-Client'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Pending-Vendor') {
+    $status = 'Pending-Vendor';
+    $ticket_status_snippet = "ticket_status = 'Pending-Vendor'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Pending-Shipment') {
+    $status = 'Pending-Shipment';
+    $ticket_status_snippet = "ticket_status = 'Pending-Shipment'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Scheduled') {
+    $status = 'Scheduled';
+    $ticket_status_snippet = "ticket_status = 'Scheduled'";
 } elseif (isset($_GET['status']) && ($_GET['status']) == 'Closed') {
     $status = 'Closed';
     $ticket_status_snippet = "ticket_status = 'Closed'";
@@ -190,7 +205,11 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                                 <label>Ticket Status</label>
                                 <select class="form-control select2" name="status">
                                     <option value="%" <?php if ($status == "%") {echo "selected";}?> >Any</option>
-                                    <option value="Open" <?php if ($status == "Open") {echo "selected";}?> >Open</option>
+                                    <option value="In-Progress" <?php if ($status == "In-Progress") {echo "selected";}?> >In-Progress</option>
+                                    <option value="Pending-Client" <?php if ($status == "Pending-Client") {echo "selected";}?> >Pending-Client</option>
+                                    <option value="Pending-Vendor" <?php if ($status == "Pending-Vendor") {echo "selected";}?> >Pending-Vendor</option>
+                                    <option value="Pending-Shipment" <?php if ($status == "Pending-Shipment") {echo "selected";}?> >Pending-Shipment</option>
+                                    <option value="Scheduled" <?php if ($status == "Scheduled") {echo "selected";}?> >Scheduled</option>
                                     <option value="Closed" <?php if ($status == "Closed") {echo "selected";}?> >Closed</option>
                                 </select>
                             </div>