diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
index e79a450cf..9f1397ba1 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -31,7 +31,7 @@ export default function OwnerFindModalContainer({
 
   useEffect(() => {
     if (modalProps.visible && owner) {
-      const s = OwnerNameDisplayFunction(owner);
+      const s = OwnerNameDisplayFunction(owner, true);
 
       setSearchText(s.trim());
       callSearchowners({ variables: { search: s.trim() } });
diff --git a/client/src/components/owner-name-display/owner-name-display.component.jsx b/client/src/components/owner-name-display/owner-name-display.component.jsx
index e22065df1..a7e59067d 100644
--- a/client/src/components/owner-name-display/owner-name-display.component.jsx
+++ b/client/src/components/owner-name-display/owner-name-display.component.jsx
@@ -27,7 +27,7 @@ export function OwnerNameDisplay({ bodyshop, ownerObject }) {
   }`.trim();
 }
 
-export function OwnerNameDisplayFunction(ownerObject) {
+export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) {
   const emptyTest =
     ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm;
 
@@ -36,7 +36,7 @@ export function OwnerNameDisplayFunction(ownerObject) {
 
   const rdxStore = store.getState();
 
-  if (rdxStore.user.bodyshop.last_name_first)
+  if (rdxStore.user.bodyshop.last_name_first && !forceFirstLast)
     return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${
       ownerObject.ownr_co_nm || ""
     }`.trim();