diff --git a/application/Address/Address.php b/application/Address/Address.php
index 076608425..a9c9d529c 100644
--- a/application/Address/Address.php
+++ b/application/Address/Address.php
@@ -74,7 +74,11 @@ class Address extends mfBaseModel {
         $old_custnum -= 900000;
       }
       
-      $fibumerge = XinonFibuMergeModel::getFirst(["old_custnum" => $old_custnum]);
+      $name_search = [];
+      if($this->company) $name_search[] = $this->company;
+      if($this->lastname) $name_search[] = $this->lastname;
+      
+      $fibumerge = XinonFibuMergeModel::getFirst(["old_custnum" => $old_custnum, "name" => $name_search]);
       if(!$fibumerge) {
         // create fibu merge
         $fibumerge = XinonFibuMergeModel::create([