diff --git a/src/components/forms/department/pos/SelectVehicleFormPOS.vue b/src/components/forms/department/pos/SelectVehicleFormPOS.vue
index 06fcbe39..57467668 100644
--- a/src/components/forms/department/pos/SelectVehicleFormPOS.vue
+++ b/src/components/forms/department/pos/SelectVehicleFormPOS.vue
@@ -11,6 +11,7 @@ import {
   reg_3,
   order_notes,
   order_po,
+  order_id,
   searchAndSelectCustomer,
   selectCustomer,
   isCustomerSelected,
@@ -95,6 +96,10 @@ const getBookingNotesValue = (booking) => {
   return String(booking?.notes ?? booking?.note ?? '').trim();
 };
 
+const getBookingReg2Value = (booking) => {
+  return normalizePlateValue(booking?.reg_2 ?? booking?.regNrTrailer ?? '');
+};
+
 const getBookingCustomerNumber = (booking) => {
   const parsedValue = Number.parseInt(String(booking?.customer_number ?? booking?.customer_id ?? ''), 10);
   return Number.isInteger(parsedValue) && parsedValue > 0 ? parsedValue : null;
@@ -167,6 +172,14 @@ const applySelectedOrderBooking = async (booking) => {
     resetReferenceFromVehicle();
   }
 
+  const bookingReg2 = getBookingReg2Value(booking);
+  if (bookingReg2 !== '') {
+    reg_2.value = bookingReg2;
+    if (order_id.value) {
+      await SessionUser.objects.orders.set.reg_2(order_id.value, bookingReg2);
+    }
+  }
+
   order_notes.value = getBookingNotesValue(booking);
   order_po.value = String(booking?.po ?? '').trim();
 
diff --git a/src/components/forms/department/pos/input/LicensePlateReg1Input.vue b/src/components/forms/department/pos/input/LicensePlateReg1Input.vue
index 174b95e0..30461670 100644
--- a/src/components/forms/department/pos/input/LicensePlateReg1Input.vue
+++ b/src/components/forms/department/pos/input/LicensePlateReg1Input.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
-import {ref, watch, defineEmits, onMounted} from "vue";
+import { ref, watch, defineEmits, onMounted } from "vue";
+import { useI18n } from "vue-i18n";
 import {
   reg_1,
   getCustomerName,
@@ -8,21 +9,23 @@ import {
   customer_id,
   clearCustomerSelection,
   department_id,
+  pendingBookings,
   loadPendingBookings,
   doesVehiclePlateHaveBooking,
   getVehiclePlateBookings,
   getPreferredVehiclePlateBooking,
-} from "@/components/shop/POSDepartmentProcess.vue"
+} from "@/components/shop/POSDepartmentProcess.vue";
 import { defineProps } from "vue";
 // Define the props for the component
 const props = defineProps({
   isRawInputField: {
     type: Boolean,
-    default: false
-  }
+    default: false,
+  },
 });
 
-const emit = defineEmits(['update:vehicleObject', 'update:focus', 'update:bookingObject', 'update:bookingMatches']);
+const emit = defineEmits(["update:vehicleObject", "update:focus", "update:bookingObject", "update:bookingMatches"]);
+const { locale } = useI18n();
 
 // Load the pending bookings when the component is mounted
 onMounted(() => {
@@ -35,20 +38,33 @@ watch(department_id, (newValue) => {
   }
 });
 
+const resolveBookingPlate = (vehicle = null, plateOverride = null) => {
+  return String(vehicle?.reg ?? plateOverride ?? reg_1.value ?? "")
+    .trim()
+    .toUpperCase();
+};
+
+const getBookingMatchesForSelection = (vehicle = null, plateOverride = null) => {
+  const bookingPlate = resolveBookingPlate(vehicle, plateOverride);
+  return bookingPlate ? getVehiclePlateBookings(bookingPlate) : [];
+};
+
 // Function to emit the booking object to the parent component
-const emitBookingObject = (vehicle) => {
-  const bookingMatches = vehicle?.reg ? getVehiclePlateBookings(vehicle.reg) : [];
-  emit('update:bookingMatches', bookingMatches);
+const emitBookingObject = (vehicle, plateOverride = null) => {
+  const bookingMatches = getBookingMatchesForSelection(vehicle, plateOverride);
+  emit("update:bookingMatches", bookingMatches);
 
   if (bookingMatches.length === 1) {
-    emit('update:bookingObject', getPreferredVehiclePlateBooking(vehicle.reg));
+    emit(
+      "update:bookingObject",
+      bookingMatches[0] || getPreferredVehiclePlateBooking(resolveBookingPlate(vehicle, plateOverride))
+    );
     return;
   }
 
-  emit('update:bookingObject', null);
+  emit("update:bookingObject", null);
 };
 
-
 // Define the vehicle response object (Example)
 const vehicle_response_object = {
   id: 43, // Vehicle ID
@@ -62,12 +78,12 @@ const vehicle_response_object = {
     enabled: 1, // How many addons are enabled
     available: 2, // How many addons are available
     list: [
-        // List of enabled addons
+      // List of enabled addons
       {
         id: 289, // Vehicle addon ID (Unique, different from the product ID or option ID)
         vehicle_id: 43, // Vehicle ID
         addon_id: 64, // Product option ID (Unique, different from the product ID or vehicle ID)
-        amount: 1,  // Amount of this addon
+        amount: 1, // Amount of this addon
         product: {
           id: 24, // Product ID (Unique, different from the vehicle ID or option ID)
           name: "Spot Free- Lastbil", // Product name
@@ -80,12 +96,12 @@ const vehicle_response_object = {
           apply_category_discount: false, // True if the product allows category, or E-conomic customer discount rules.
           requires_note: false, // True if the product requires a note when added to a vehicle
           created_at: "2024-12-09 14:31:49", // Product created date
-          updated_at: "2025-04-08 14:07:41" // Product updated date
-        }
-      }
-    ]
-  }
-}
+          updated_at: "2025-04-08 14:07:41", // Product updated date
+        },
+      },
+    ],
+  },
+};
 
 const get_unregistered_vehicle_object = (reg) => {
   // Generate an id for the unregistered vehicle, this is only used for the dropdown
@@ -103,10 +119,10 @@ const get_unregistered_vehicle_object = (reg) => {
     addons: {
       enabled: 0,
       available: 0,
-      list: []
-    }
+      list: [],
+    },
   };
-}
+};
 
 // To prevent the searches from overriding more recent searches
 const current_search_id = ref(null);
@@ -121,7 +137,7 @@ const is_latest_search = (search_id) => {
 };
 
 const normalizeCustomerNumber = (value) => {
-  const parsed = Number.parseInt(String(value ?? ''), 10);
+  const parsed = Number.parseInt(String(value ?? ""), 10);
   return Number.isInteger(parsed) && parsed > 0 ? parsed : null;
 };
 
@@ -131,7 +147,9 @@ const isVehicleCustomerAlreadySelected = (vehicle) => {
 };
 
 const shouldPreserveCustomerSelection = (plateValue) => {
-  const normalizedPlate = String(plateValue ?? '').trim().toUpperCase();
+  const normalizedPlate = String(plateValue ?? "")
+    .trim()
+    .toUpperCase();
   if (!normalizedPlate) {
     return false;
   }
@@ -155,17 +173,16 @@ const syncMatchedVehicleSelection = (vehicle) => {
 
   const vehicleCustomerNumber = normalizeCustomerNumber(vehicle.customer_id);
   if (
-      vehicleCustomerNumber &&
-      !isVehicleCustomerAlreadySelected(vehicle) &&
-      pendingVehicleCustomerLookup !== vehicleCustomerNumber
+    vehicleCustomerNumber &&
+    !isVehicleCustomerAlreadySelected(vehicle) &&
+    pendingVehicleCustomerLookup !== vehicleCustomerNumber
   ) {
     pendingVehicleCustomerLookup = vehicleCustomerNumber;
-    searchAndSelectCustomer(vehicleCustomerNumber)
-        .finally(() => {
-          if (pendingVehicleCustomerLookup === vehicleCustomerNumber) {
-            pendingVehicleCustomerLookup = null;
-          }
-        });
+    searchAndSelectCustomer(vehicleCustomerNumber).finally(() => {
+      if (pendingVehicleCustomerLookup === vehicleCustomerNumber) {
+        pendingVehicleCustomerLookup = null;
+      }
+    });
   }
 
   emitVehicleObject(vehicle);
@@ -178,11 +195,10 @@ const onInputChange = (event) => {
   const inputValue = event.target.value;
   // Perform any necessary validation or processing on the input value
   console.log("Input value changed:", inputValue);
-
 };
 
 // Function to search for vehicles
-const searchVehicle = async ( inputValue, search_id ) => {
+const searchVehicle = async (inputValue, search_id) => {
   // Check if the search ID is the latest
   if (!is_latest_search(search_id)) {
     console.log("Search ID is not the latest. Ignoring this search.");
@@ -191,36 +207,36 @@ const searchVehicle = async ( inputValue, search_id ) => {
   // Set the isSearching flag to true
   isSearching.value = true;
   // Perform the search
-  SessionUser.request(
-      SessionUser.objects.vehicles.meta.endpoint,
-      'GET',
-      {
-        search: inputValue,
-        page: 1,
-        limit: 10,
+  SessionUser.request(SessionUser.objects.vehicles.meta.endpoint + "/search", "GET", {
+    search: inputValue,
+    ...(department_id.value ? { department: department_id.value } : {}),
+    page: 1,
+    limit: 10,
+  })
+    .then((response) => {
+      if (!is_latest_search(search_id)) {
+        return;
       }
-  ).then(response => {
-    if (!is_latest_search(search_id)) {
-      return;
-    }
-    let result = response?.data?.data;
-    if (result && result.length > 0) {
-      // If there are results, set the vehicles_matching array
-      vehicles_matching.value = result;
-    } else {
-      // If no results, clear the vehicles_matching array
-      vehicles_matching.value = [];
-    }
-    getUnregisteredVehicleObjects(inputValue, search_id);
-  }).catch(error => {
-    console.error("Error:", error, search_id);
-  }).finally(() => {
-    console.log("Finish search", search_id);
-    if (is_latest_search(search_id)) {
-      // Set the isSearching flag to false
-      isSearching.value = false;
-    }
-  });
+      let result = response?.data?.data;
+      if (result && result.length > 0) {
+        // If there are results, set the vehicles_matching array
+        vehicles_matching.value = result;
+      } else {
+        // If no results, clear the vehicles_matching array
+        vehicles_matching.value = [];
+      }
+      getUnregisteredVehicleObjects(inputValue, search_id);
+    })
+    .catch((error) => {
+      console.error("Error:", error, search_id);
+    })
+    .finally(() => {
+      console.log("Finish search", search_id);
+      if (is_latest_search(search_id)) {
+        // Set the isSearching flag to false
+        isSearching.value = false;
+      }
+    });
 };
 
 const getUnregisteredVehicleObjects = (inputValue, search_id) => {
@@ -234,51 +250,50 @@ const getUnregisteredVehicleObjects = (inputValue, search_id) => {
     vehicles_matching.value = [];
     return;
   }
-  SessionUser.request(
-      '/department/vehicles/unknown-customer',
-      'GET',
-      {
-        search: inputValue,
-        page: 1,
-        limit: 10,
-      }
-  ).then(response => {
-    console.log("Unregistered vehicles:", response.data.data);
-    if (!is_latest_search(search_id)) {
-      return
-    }
-    let result = response?.data?.data;
-    let unregistered_vehicles = [];
-    if (result && result.length > 0) {
-      // If there are results, parse them into unregistered_vehicles
-      for (let i = 0; i < result.length; i++) {
-        // Check if the unregistered vehicle already exists in the vehicles_matching array
-        let existingVehicle = vehicles_matching.value.find(vehicle => vehicle.reg === result[i].reg_1);
-        if (existingVehicle) {
-          // If it exists, skip adding it again
-          continue;
-        }
-        unregistered_vehicles.push(get_unregistered_vehicle_object(result[i].reg_1));
-      }
-      // Set the vehicles_matching array to include both registered and unregistered vehicles
-      vehicles_matching.value = [...vehicles_matching.value, ...unregistered_vehicles];
-    } else {
-      // Do nothing
-    }
-  }).catch(error => {
-    console.error("Error:", error, search_id);
-  }).finally(() => {
-    console.log("Finish search", search_id);
-    if (is_latest_search(search_id)) {
-      // Set the isSearching flag to false
-      isSearching.value = false;
-    }
+  SessionUser.request("/department/vehicles/unknown-customer", "GET", {
+    search: inputValue,
+    page: 1,
+    limit: 10,
   })
+    .then((response) => {
+      console.log("Unregistered vehicles:", response.data.data);
+      if (!is_latest_search(search_id)) {
+        return;
+      }
+      let result = response?.data?.data;
+      let unregistered_vehicles = [];
+      if (result && result.length > 0) {
+        // If there are results, parse them into unregistered_vehicles
+        for (let i = 0; i < result.length; i++) {
+          // Check if the unregistered vehicle already exists in the vehicles_matching array
+          let existingVehicle = vehicles_matching.value.find((vehicle) => vehicle.reg === result[i].reg_1);
+          if (existingVehicle) {
+            // If it exists, skip adding it again
+            continue;
+          }
+          unregistered_vehicles.push(get_unregistered_vehicle_object(result[i].reg_1));
+        }
+        // Set the vehicles_matching array to include both registered and unregistered vehicles
+        vehicles_matching.value = [...vehicles_matching.value, ...unregistered_vehicles];
+      } else {
+        // Do nothing
+      }
+    })
+    .catch((error) => {
+      console.error("Error:", error, search_id);
+    })
+    .finally(() => {
+      console.log("Finish search", search_id);
+      if (is_latest_search(search_id)) {
+        // Set the isSearching flag to false
+        isSearching.value = false;
+      }
+    });
 };
 
 const getVehicleObjectFromId = (id) => {
   // Find the vehicle object by ID
-  return vehicles_matching.value.find(vehicle => vehicle.id === id);
+  return vehicles_matching.value.find((vehicle) => vehicle.id === id);
 };
 
 // Watch for changes in reg_1
@@ -305,10 +320,7 @@ watch(reg_1, (newValue) => {
     emitVehicleObject(null);
   }
   // Perform the search
-  searchVehicle(
-      newValue,
-      search_id
-  );
+  searchVehicle(newValue, search_id);
 });
 
 const unselectCustomerOnChange = () => {
@@ -316,7 +328,7 @@ const unselectCustomerOnChange = () => {
 };
 
 const selectVehicle = (vehicle_id) => {
-  console.log('Select using click', vehicle_id);
+  console.log("Select using click", vehicle_id);
   // Find the vehicle object by ID
   const vehicle = getVehicleObjectFromId(vehicle_id);
   syncMatchedVehicleSelection(vehicle);
@@ -324,7 +336,7 @@ const selectVehicle = (vehicle_id) => {
 
 const getSearchIndexByVehicleId = (vehicle_id) => {
   // Find the index of the vehicle in the vehicles_matching array
-  return vehicles_matching.value.findIndex(vehicle => vehicle.id === vehicle_id);
+  return vehicles_matching.value.findIndex((vehicle) => vehicle.id === vehicle_id);
 };
 
 const selectDropdownItem = (index) => {
@@ -350,26 +362,26 @@ const keyDownNextTabIndexButton = (event, tabIndex) => {
 };
 const arrowKeyHandler = (event) => {
   // Handle arrow key navigation in the dropdown
-  if (event.key === 'ArrowDown') {
+  if (event.key === "ArrowDown") {
     event.preventDefault();
     if (selectedDropdownItem.value < vehicles_matching.value.length - 1) {
       selectedDropdownItem.value++;
     }
   }
-  if (event.key === 'ArrowUp') {
+  if (event.key === "ArrowUp") {
     event.preventDefault();
     if (selectedDropdownItem.value > -1) {
       selectedDropdownItem.value--;
     }
   }
-  if (event.key === 'Enter') {
+  if (event.key === "Enter") {
     event.preventDefault();
     selectDropdownItem(selectedDropdownItem.value);
     selectedDropdownItem.value = -1;
     // Imitate the tab key press to move to the next input
     focusNextField();
   }
-  if (event.key === 'Tab') {
+  if (event.key === "Tab") {
     event.preventDefault();
     selectDropdownItem(selectedDropdownItem.value);
     selectedDropdownItem.value = -1;
@@ -387,14 +399,17 @@ const lostfocus = () => {
   }, 200);
   // Check if the current input value is in the vehicles_matching array
   const currentValue = reg_1.value;
-  const vehicle = vehicles_matching.value.find(vehicle => vehicle.reg === currentValue);
+  const vehicle = vehicles_matching.value.find((vehicle) => vehicle.reg === currentValue);
   if (vehicle) {
     syncMatchedVehicleSelection(vehicle);
   } else {
+    const bookingMatches = getBookingMatchesForSelection(null, currentValue);
     // If not found, clear the vehicles_matching array
     vehicles_matching.value = [];
-    clearCustomerSelection();
-    emitVehicleObject(null);
+    if (bookingMatches.length === 0) {
+      clearCustomerSelection();
+    }
+    emitVehicleObject(null, currentValue);
   }
 };
 const isSearching = ref(false);
@@ -403,9 +418,11 @@ const isSearching = ref(false);
 watch(vehicles_matching, (newValue) => {
   // Check if the input directly matches an item in the vehicles_matching array (Then we can automatically select it)
   const currentValue = reg_1.value;
-  const vehicle = newValue.find(vehicle => vehicle.reg === currentValue);
+  const vehicle = newValue.find((vehicle) => vehicle.reg === currentValue);
   if (vehicle) {
     syncMatchedVehicleSelection(vehicle);
+  } else if (getBookingMatchesForSelection(null, currentValue).length > 0) {
+    emitVehicleObject(null, currentValue);
   }
   // Check if the selectedDropdownItem index is valid
   if (selectedDropdownItem.value >= newValue.length) {
@@ -414,6 +431,16 @@ watch(vehicles_matching, (newValue) => {
   }
 });
 
+watch(pendingBookings, () => {
+  const currentValue = reg_1.value;
+  if (!currentValue) {
+    return;
+  }
+
+  const vehicle = vehicles_matching.value.find((matchingVehicle) => matchingVehicle.reg === currentValue) || null;
+  emitBookingObject(vehicle, currentValue);
+});
+
 const focusNextField = () => {
   // Focus on the next input field
   const nextField = document.querySelector('input[tabindex="2"]');
@@ -423,26 +450,64 @@ const focusNextField = () => {
 };
 
 // Function to emit the vehicle object to the parent component
-const emitVehicleObject = (vehicle) => {
+const emitVehicleObject = (vehicle, plateOverride = null) => {
   // Emit the vehicle object
-  emit('update:vehicleObject', vehicle);
+  emit("update:vehicleObject", vehicle);
   // Emit the booking object if the vehicle has a booking
-  emitBookingObject(vehicle);
+  emitBookingObject(vehicle, plateOverride);
 };
 
 const emitFocus = (isFocused) => {
   // Emit the focus event
-  emit('update:focus', isFocused);
+  emit("update:focus", isFocused);
+};
+
+const isVehicleBooked = (vehicle) => {
+  return (
+    doesVehiclePlateHaveBooking(vehicle?.reg) ||
+    !!vehicle?.booking_id ||
+    vehicle?.status === "booked" ||
+    (Array.isArray(vehicle?.booking_matches) && vehicle.booking_matches.length > 0)
+  );
+};
+
+const getVehicleBookingDateLabel = (vehicle) => {
+  if (!isVehicleBooked(vehicle)) {
+    return "";
+  }
+
+  const preferredBooking = getPreferredVehiclePlateBooking(vehicle?.reg);
+  const rawValue =
+    preferredBooking?.datetime ??
+    preferredBooking?.created_at ??
+    preferredBooking?.date ??
+    vehicle?.booking_datetime ??
+    vehicle?.datetime ??
+    vehicle?.created_at ??
+    null;
+
+  if (!rawValue) {
+    return "";
+  }
+
+  const parsedValue = new Date(rawValue);
+  if (Number.isNaN(parsedValue.getTime())) {
+    return String(rawValue);
+  }
+
+  return new Intl.DateTimeFormat(locale.value || undefined, {
+    dateStyle: "short",
+  }).format(parsedValue);
 };
 
 const getDropdownIconColor = (vehicle) => {
   // Determine the icon color based on the vehicle's status
   const colors = {
-    verified: 'has-text-success', // Used when the vehicles owner is verified
-    unverified: 'has-text-warning', // Used when the vehicles owner is unverified
-    barred: 'has-text-danger', // Used when the vehicles owner is barred
-    hasBooking: 'has-text-link', // Used when the vehicle has a booking
-  }
+    verified: "has-text-success", // Used when the vehicles owner is verified
+    unverified: "has-text-warning", // Used when the vehicles owner is unverified
+    barred: "has-text-danger", // Used when the vehicles owner is barred
+    hasBooking: "has-text-link", // Used when the vehicle has a booking
+  };
   let iconColor = colors.unverified; // Default color
 
   // Check if the vehicle is verified
@@ -455,7 +520,7 @@ const getDropdownIconColor = (vehicle) => {
   }
   // Check if the vehicle has a booking
   function hasBooking(vehicle) {
-    return doesVehiclePlateHaveBooking(vehicle.reg);
+    return isVehicleBooked(vehicle);
   }
 
   if (isVerified(vehicle)) {
@@ -474,78 +539,100 @@ const getDropdownIconColor = (vehicle) => {
 const getCurrentIconColor = () => {
   // Check if the current input value is in the vehicles_matching array
   const currentValue = reg_1.value;
-  const vehicle = vehicles_matching.value.find(vehicle => vehicle.reg === currentValue);
-  let tmp_color = 'has-text-grey';
+  const vehicle = vehicles_matching.value.find((vehicle) => vehicle.reg === currentValue);
+  let tmp_color = "has-text-grey";
   if (vehicle) {
     // If the vehicle is found, return the icon color
     tmp_color = getDropdownIconColor(vehicle);
   }
   // Check if there's a booking for the current vehicle
   if (doesVehiclePlateHaveBooking(currentValue)) {
-    tmp_color = 'has-text-link';
+    tmp_color = "has-text-link";
   }
   // If not found, return the default color
   return tmp_color;
 };
-
 </script>
 
 <template>
   <template v-if="isRawInputField">
     <input
-        type="text"
-        v-model="reg_1"
-        @focus="showSelector = true; emitFocus(true)"
-        @blur="lostfocus"
-        @keydown="arrowKeyHandler"
-        id="reg_1"
-        autocomplete="off"
+      type="text"
+      v-model="reg_1"
+      @focus="
+        showSelector = true;
+        emitFocus(true);
+      "
+      @blur="lostfocus"
+      @keydown="arrowKeyHandler"
+      id="reg_1"
+      autocomplete="off"
     />
   </template>
   <div v-if="!isRawInputField">
     <!-- License Plate Registration 1 Input -->
     <div class="field">
-      <div class="control has-icons-left" :class="{'is-loading': isSearching}">
-         <span class="icon is-small is-left">
-           <!-- Circle icon -->
-           <i class="fas fa-circle" :class="getCurrentIconColor()"></i>
+      <div class="control has-icons-left" :class="{ 'is-loading': isSearching }">
+        <span class="icon is-small is-left">
+          <!-- Circle icon -->
+          <i class="fas fa-circle" :class="getCurrentIconColor()"></i>
         </span>
         <input
-            type="text"
-            class="input has-sharp-edges is-loading"
-            v-model="reg_1"
-            @focus="showSelector = true; emitFocus(true)"
-            @blur="lostfocus"
-            @keydown="arrowKeyHandler"
-            id="reg_1"
-            autocomplete="off"
+          type="text"
+          class="input has-sharp-edges is-loading"
+          v-model="reg_1"
+          @focus="
+            showSelector = true;
+            emitFocus(true);
+          "
+          @blur="lostfocus"
+          @keydown="arrowKeyHandler"
+          id="reg_1"
+          autocomplete="off"
         />
       </div>
     </div>
     <!-- Dropdown for license plate suggestions -->
-    <div
-        class="dropdown"
-        :class="{'is-active': showSelector}"
-        v-show="showSelector && vehicles_matching.length > 0"
-    >
+    <div class="dropdown" :class="{ 'is-active': showSelector }" v-show="showSelector && vehicles_matching.length > 0">
       <div class="dropdown-menu">
         <div class="dropdown-content">
           <a
-              class="dropdown-item is-clickable"
-              v-for="result in vehicles_matching"
-              :key="result.id"
-              @mousedown="selectVehicle(result.id)"
-              :class="{
-                'is-active': getSearchIndexByVehicleId(result.id) === selectedDropdownItem,
-                'is-drop-down-selected': getSearchIndexByVehicleId(result.customerNumber) === selectedDropdownItem,
-              }">
-            <span class="icon">
-              <!-- Circle icon -->
-              <i class="fas fa-circle" :class="getDropdownIconColor(result)"></i>
-            </span>
-            <span>
-            {{ result.reg }}{{ result.customer_name ? (' - ' + result.customer_name ) : '' }}{{ result.barred ? ' ('+ SessionUser.objects.global.language.barred + ')' : '' }}
-            </span>
+            class="dropdown-item is-clickable"
+            v-for="result in vehicles_matching"
+            :key="result.id"
+            @mousedown="selectVehicle(result.id)"
+            :class="{
+              'is-active': getSearchIndexByVehicleId(result.id) === selectedDropdownItem,
+              'is-drop-down-selected': getSearchIndexByVehicleId(result.customerNumber) === selectedDropdownItem,
+            }"
+          >
+            <div class="license-plate-result">
+              <div class="license-plate-result__text">
+                <span class="icon">
+                  <!-- Circle icon -->
+                  <i class="fas fa-circle" :class="getDropdownIconColor(result)"></i>
+                </span>
+                <span>
+                  {{ result.reg }}{{ result.customer_name ? " - " + result.customer_name : ""
+                  }}{{ result.barred ? " (" + SessionUser.objects.global.language.barred + ")" : "" }}
+                </span>
+              </div>
+              <span v-if="isVehicleBooked(result)" class="license-plate-result__booking">
+                <span
+                  class="icon has-text-link license-plate-result__booking-icon"
+                  :data-testid="`desktop-booked-icon-${result.id}`"
+                >
+                  <i class="fas fa-calendar-check"></i>
+                </span>
+                <span
+                  v-if="getVehicleBookingDateLabel(result)"
+                  class="license-plate-result__booking-date"
+                  :data-testid="`desktop-booked-date-${result.id}`"
+                >
+                  {{ getVehicleBookingDateLabel(result) }}
+                </span>
+              </span>
+            </div>
           </a>
         </div>
       </div>
@@ -554,5 +641,35 @@ const getCurrentIconColor = () => {
 </template>
 
 <style scoped>
+.license-plate-result {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.75rem;
+}
 
+.license-plate-result__text {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.25rem;
+  min-width: 0;
+}
+
+.license-plate-result__booking-icon {
+  flex: 0 0 auto;
+}
+
+.license-plate-result__booking {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.3rem;
+  flex: 0 0 auto;
+}
+
+.license-plate-result__booking-date {
+  color: #58697f;
+  font-size: 0.85rem;
+  font-weight: 600;
+  white-space: nowrap;
+}
 </style>
diff --git a/src/components/shop/POSDepartmentProcess.vue b/src/components/shop/POSDepartmentProcess.vue
index 6944e79d..ea5f1b1d 100644
--- a/src/components/shop/POSDepartmentProcess.vue
+++ b/src/components/shop/POSDepartmentProcess.vue
@@ -1407,6 +1407,10 @@ const getOrderBookingNotesValue = (booking) => {
   return String(booking?.notes ?? booking?.note ?? "").trim();
 };
 
+const getOrderBookingReg2Value = (booking) => {
+  return normalizeRegistrationValue(booking?.reg_2 ?? booking?.regNrTrailer ?? "");
+};
+
 const getOrderBookingCustomerNumber = (booking) => {
   return resolveCustomerNumber(booking?.customer_number ?? booking?.customer_id ?? booking?.customerNumber);
 };
@@ -1533,6 +1537,12 @@ const hydrateSelectedOrderBookingForDesktop = async () => {
       reference.value = bookingReference;
     }
 
+    const bookingReg2 = getOrderBookingReg2Value(booking);
+    if (bookingReg2 !== "" && bookingReg2 !== reg_2.value) {
+      await SessionUser.objects.orders.set.reg_2(normalizedOrderId, bookingReg2);
+      reg_2.value = bookingReg2;
+    }
+
     const bookingNotes = getOrderBookingNotesValue(booking);
     if (bookingNotes !== "" && bookingNotes !== order_notes.value) {
       await SessionUser.objects.orders.set.notes(normalizedOrderId, bookingNotes);
diff --git a/tests/e2e/pos-flow.spec.js b/tests/e2e/pos-flow.spec.js
index 5206d4e8..579c101e 100644
--- a/tests/e2e/pos-flow.spec.js
+++ b/tests/e2e/pos-flow.spec.js
@@ -331,6 +331,18 @@ async function mockPosApi(page, fixture) {
       return;
     }
 
+    if (pathname.endsWith("/vehicles/search") && method === "GET") {
+      const search = (parsedUrl.searchParams.get("search") || "").toUpperCase();
+      const matches = fixture.vehicles.filter((vehicle) => vehicle.reg.includes(search));
+      await route.fulfill(
+        json({
+          success: true,
+          data: matches,
+        })
+      );
+      return;
+    }
+
     if (pathname.endsWith("/vehicles") && method === "GET") {
       const search = (parsedUrl.searchParams.get("search") || "").toUpperCase();
       const matches = fixture.vehicles.filter((vehicle) => vehicle.reg.includes(search));
@@ -805,6 +817,22 @@ test.describe("POS flow", () => {
     expect(consoleProblems.join("\n")).not.toContain("reg_1");
   });
 
+  test("desktop hides the Sidste vask section when the selected vehicle has no last_order_id", async ({
+    page,
+  }, testInfo) => {
+    test.skip(testInfo.project.name !== "chromium-desktop", "Desktop POS step 1 is validated on chromium-desktop.");
+
+    const fixture = createPosFixture();
+
+    await setupDesktopPosPage(page, fixture, { token: "pos-no-last-wash-token" });
+
+    await page.locator("#reg_1").fill("AB12345");
+    await expect(page.getByTestId("pos-step-1").getByText("Pleno Logistics").first()).toBeVisible({ timeout: 10_000 });
+
+    await expect(page.getByText(/Sidste vask/i)).toHaveCount(0);
+    await expect(page.getByRole("button", { name: /Kopier sidste vask/i })).toHaveCount(0);
+  });
+
   test("desktop flow creates transaction, renders cart, and reaches completion step", async ({ page }, testInfo) => {
     test.skip(testInfo.project.name !== "chromium-desktop", "Desktop POS flow is validated on chromium-desktop.");
 
@@ -889,6 +917,50 @@ test.describe("POS flow", () => {
     expect(consoleProblems.join("\n")).not.toContain("Extraneous non-props attributes");
   });
 
+  test("desktop marks booked vehicles in the dropdown when the vehicle payload already carries a booking", async ({
+    page,
+  }, testInfo) => {
+    test.skip(
+      testInfo.project.name !== "chromium-desktop",
+      "Desktop POS booking flow is validated on chromium-desktop."
+    );
+
+    const fixture = createPosFixture();
+    fixture.vehicles = [
+      {
+        ...fixture.vehicles[0],
+        reg: "EC21235",
+        booking_id: 8991,
+        status: "booked",
+      },
+      {
+        ...fixture.vehicles[0],
+        id: 7002,
+        reg: "EC21234",
+        booking_id: 8992,
+        status: "booked",
+      },
+    ];
+    fixture.orderBookings = [
+      buildOrderBooking(8991, {
+        reg_1: "EC21235",
+        datetime: "2026-01-03T07:00:00.000Z",
+      }),
+      buildOrderBooking(8992, {
+        reg_1: "EC21234",
+        datetime: "2026-01-04T09:00:00.000Z",
+      }),
+    ];
+
+    await setupDesktopPosPage(page, fixture, { token: "pos-desktop-booked-dropdown" });
+
+    await page.locator("#reg_1").fill("EC212");
+    await expect(page.getByTestId("desktop-booked-icon-7001")).toBeVisible({ timeout: 10_000 });
+    await expect(page.getByTestId("desktop-booked-icon-7002")).toBeVisible({ timeout: 10_000 });
+    await expect(page.getByTestId("desktop-booked-date-7001")).toContainText(/\d/, { timeout: 10_000 });
+    await expect(page.getByTestId("desktop-booked-date-7002")).toContainText(/\d/, { timeout: 10_000 });
+  });
+
   test("desktop auto-applies a single matching order booking and completes that booking", async ({
     page,
   }, testInfo) => {
@@ -902,6 +974,7 @@ test.describe("POS flow", () => {
       buildOrderBooking(8101, {
         reference: "SINGLE-BOOKING-REF",
         reference_number: "SINGLE-BOOKING-REF",
+        reg_2: "TRAILER-1",
         notes: "Single desktop booking",
         note: "Single desktop booking",
         items: [
@@ -920,6 +993,7 @@ test.describe("POS flow", () => {
     const activeBookingSelector = page.locator('[data-testid="default-object-selector"].is-active');
     await page.locator("#reg_1").fill("AB12345");
     await expect(activeBookingSelector).toHaveCount(0);
+    await expect(page.locator("#reg_2")).toHaveValue("TRAILER-1");
 
     await page.locator('[data-testid="pos-next-step"]:visible').click();
     await expect(page.getByTestId("pos-step-2")).toBeVisible({ timeout: 10_000 });
@@ -927,6 +1001,7 @@ test.describe("POS flow", () => {
     await expect
       .poll(() => fixture.ordersById[9300]?.reference || null, { timeout: 10_000 })
       .toBe("SINGLE-BOOKING-REF");
+    await expect.poll(() => fixture.ordersById[9300]?.reg_2 || null, { timeout: 10_000 }).toBe("TRAILER-1");
     await expect
       .poll(() => (fixture.orderItemsByOrderId[9300] || []).map((item) => Number(item.product_id)), { timeout: 10_000 })
       .toEqual([53, 63]);
@@ -960,6 +1035,7 @@ test.describe("POS flow", () => {
         datetime: "2026-01-01T07:00:00.000Z",
         reference: "BOOKING-A-REF",
         reference_number: "BOOKING-A-REF",
+        reg_2: "TRAILER-A",
         items: [
           { id: 53, name: "Tankvogn med hænger", price: 599, quantity: 1 },
           { id: 63, name: "Dolly", price: 275, quantity: 1 },
@@ -973,6 +1049,7 @@ test.describe("POS flow", () => {
         datetime: "2026-01-01T09:00:00.000Z",
         reference: "BOOKING-B-REF",
         reference_number: "BOOKING-B-REF",
+        reg_2: "TRAILER-B",
         items: [{ id: 63, name: "Dolly", price: 275, quantity: 1 }],
         parsed_services: {
           string: "Dolly",
@@ -995,10 +1072,12 @@ test.describe("POS flow", () => {
 
     await activeBookingSelector.getByTestId("pos-desktop-order-booking-use-8102").click();
     await expect(page.locator("#reference")).toHaveValue("BOOKING-A-REF");
+    await expect(page.locator("#reg_2")).toHaveValue("TRAILER-A");
 
     await page.locator('[data-testid="pos-next-step"]:visible').click();
     await expect(page.getByTestId("pos-step-2")).toBeVisible({ timeout: 10_000 });
 
+    await expect.poll(() => fixture.ordersById[9300]?.reg_2 || null, { timeout: 10_000 }).toBe("TRAILER-A");
     await expect
       .poll(() => (fixture.orderItemsByOrderId[9300] || []).map((item) => Number(item.product_id)), { timeout: 10_000 })
       .toEqual([53, 63]);
@@ -1018,6 +1097,75 @@ test.describe("POS flow", () => {
     expect(fixture.completedBookingIds).not.toContain(8103);
   });
 
+  test("desktop opens the booking chooser for a booked plate even without a vehicle match", async ({
+    page,
+  }, testInfo) => {
+    test.skip(
+      testInfo.project.name !== "chromium-desktop",
+      "Desktop POS booking flow is validated on chromium-desktop."
+    );
+
+    const fixture = createPosFixture();
+    fixture.orderBookings = [
+      buildOrderBooking(8111, {
+        reg_1: "BOOKONLY1",
+        datetime: "2026-01-01T07:00:00.000Z",
+        reference: "BOOK-ONLY-A",
+        reference_number: "BOOK-ONLY-A",
+        items: [
+          { id: 53, name: "Tankvogn med hænger", price: 599, quantity: 1 },
+          { id: 63, name: "Dolly", price: 275, quantity: 1 },
+        ],
+        parsed_services: {
+          string: "Tankvogn med hænger, Dolly",
+          array: ["Tankvogn med hænger", "Dolly"],
+        },
+      }),
+      buildOrderBooking(8112, {
+        reg_1: "BOOKONLY1",
+        datetime: "2026-01-01T09:00:00.000Z",
+        reference: "BOOK-ONLY-B",
+        reference_number: "BOOK-ONLY-B",
+        items: [{ id: 63, name: "Dolly", price: 275, quantity: 1 }],
+        parsed_services: {
+          string: "Dolly",
+          array: ["Dolly"],
+        },
+      }),
+    ];
+
+    await setupDesktopPosPage(page, fixture, { token: "pos-desktop-booking-only" });
+
+    const activeBookingSelector = page.locator('[data-testid="default-object-selector"].is-active');
+    await page.locator("#reg_1").fill("BOOKONLY1");
+    await expect(activeBookingSelector).toBeVisible({ timeout: 10_000 });
+    await activeBookingSelector.getByTestId("pos-desktop-order-booking-use-8111").click();
+    await expect(page.locator("#reference")).toHaveValue("BOOK-ONLY-A");
+
+    await page.locator('[data-testid="pos-next-step"]:visible').click();
+    await expect(page.getByTestId("pos-step-2")).toBeVisible({ timeout: 10_000 });
+    await expect
+      .poll(() => (fixture.orderItemsByOrderId[9300] || []).map((item) => Number(item.product_id)), { timeout: 10_000 })
+      .toEqual([53, 63]);
+
+    await page.locator('[data-testid="pos-next-step"]:visible').click();
+    await expect(page.getByTestId("pos-step-3")).toBeVisible({ timeout: 10_000 });
+    await page.locator('[data-testid="pos-next-step"]:visible').click();
+
+    await expect.poll(() => fixture.ordersById[9300]?.booking_id || null, { timeout: 10_000 }).toBe(8111);
+    await expect
+      .poll(
+        () =>
+          fixture.bookingOrderAssignments.some(
+            (entry) => Number(entry?.id) === 8111 && Number(entry?.order_id) === 9300
+          ),
+        { timeout: 10_000 }
+      )
+      .toBe(true);
+    await expect.poll(() => fixture.completedBookingIds, { timeout: 10_000 }).toContain(8111);
+    expect(fixture.completedBookingIds).not.toContain(8112);
+  });
+
   test("desktop continue without booking skips hydration and completion requests", async ({ page }, testInfo) => {
     test.skip(
       testInfo.project.name !== "chromium-desktop",
diff --git a/tests/e2e/support/network.js b/tests/e2e/support/network.js
index 56f53039..5365621e 100644
--- a/tests/e2e/support/network.js
+++ b/tests/e2e/support/network.js
@@ -1176,7 +1176,9 @@ async function handlePosRoute({ route, request, parsedUrl, pathname, method, pos
   }
 
   if (pathname.endsWith("/bookings") && method === "GET") {
-    await route.fulfill(json({ success: true, data: Array.isArray(posFixture.orderBookings) ? posFixture.orderBookings : [] }));
+    await route.fulfill(
+      json({ success: true, data: Array.isArray(posFixture.orderBookings) ? posFixture.orderBookings : [] })
+    );
     return true;
   }
 
@@ -1189,9 +1191,7 @@ async function handlePosRoute({ route, request, parsedUrl, pathname, method, pos
     const bookingDate = String(body.datetime || createdAt).slice(0, 10);
     const customer = posFixture.customersByNumber?.[customerNumber] || null;
     const serviceNames = Array.isArray(body.items)
-      ? body.items
-          .map((item) => String(item?.name || "").trim())
-          .filter(Boolean)
+      ? body.items.map((item) => String(item?.name || "").trim()).filter(Boolean)
       : [];
 
     const createdBooking = {
@@ -1334,6 +1334,19 @@ async function handlePosRoute({ route, request, parsedUrl, pathname, method, pos
     return true;
   }
 
+  if (pathname.endsWith("/vehicles/search") && method === "GET") {
+    const search = String(parsedUrl.searchParams.get("search") || "").toUpperCase();
+    const vehicles = (posFixture.vehicles || []).filter(
+      (vehicle) =>
+        !search ||
+        String(vehicle.reg || "")
+          .toUpperCase()
+          .includes(search)
+    );
+    await route.fulfill(json({ success: true, data: vehicles }));
+    return true;
+  }
+
   if (pathname.endsWith("/vehicles") && method === "GET") {
     const search = String(parsedUrl.searchParams.get("search") || "").toUpperCase();
     const vehicles = (posFixture.vehicles || []).filter(