diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index 2f82e3561b4b..d1e8c8ce6023 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -195,8 +195,11 @@ class BaseModel extends Model
         // Remove any runs of periods (thanks falstro!)
         $formatted_number = mb_ereg_replace("([\.]{2,})", '', $formatted_number);
 
-        $formatted_number = str_replace(" ", "_", $formatted_number);
+        // $formatted_number = str_replace(" ", "_", $formatted_number);
         
+        //11-01-2021 fixes for multiple spaces
+        $formatted_number = preg_replace('/\s+/', '_', $formatted_number);
+
         return $formatted_number;
     }