diff --git a/client_asset_import_modal.php b/client_asset_import_modal.php
index 583bf346..cc10bd7b 100644
--- a/client_asset_import_modal.php
+++ b/client_asset_import_modal.php
@@ -14,7 +14,7 @@
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location</p>
                     <hr>
                     <div class="form-group my-4">
-                        <input type="file" class="form-control-file" name="file" accept=".csv">
+                        <input type="file" class="form-control-file" name="file" accept=".csv" required>
                     </div>
                     <hr>
                     <div>Download <a href="post.php?download_client_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
diff --git a/client_contact_import_modal.php b/client_contact_import_modal.php
index a7c02bfd..bc567b60 100644
--- a/client_contact_import_modal.php
+++ b/client_contact_import_modal.php
@@ -13,7 +13,7 @@
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
                     <hr>
                     <div class="form-group my-4">
-                        <input type="file" class="form-control-file" name="file" accept=".csv">
+                        <input type="file" class="form-control-file" name="file" accept=".csv" required>
                     </div>
                     <hr>
                     <div>Download: <a class="text-bold" href="post.php?download_client_contacts_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
diff --git a/client_import_modal.php b/client_import_modal.php
index eb447ebe..e6d9eacd 100644
--- a/client_import_modal.php
+++ b/client_import_modal.php
@@ -8,12 +8,11 @@
                 </button>
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
                     <p><strong>Format csv file with headings & data:</strong><br>Client Name, Industry, Referral, Website, Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation</p>
                     <hr>
                     <div class="form-group my-4">
-                        <input type="file" class="form-control-file" name="file" accept=".csv">
+                        <input type="file" class="form-control-file" name="file" accept=".csv" required>
                     </div>
                     <hr>
                     <div>Download: <a class="text-bold" href="post.php?download_clients_csv_template">sample csv template</a></div>
diff --git a/client_location_import_modal.php b/client_location_import_modal.php
index 42cf942e..579d82b9 100644
--- a/client_location_import_modal.php
+++ b/client_location_import_modal.php
@@ -13,7 +13,7 @@
 					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Address, City, State, Postal Code, Phone, Hours</p>
 					<hr>
 					<div class="form-group my-4">
-						<input type="file" class="form-control-file" name="file" accept=".csv">
+						<input type="file" class="form-control-file" name="file" accept=".csv" required>
 					</div>
 					<hr>
 					<div>Download: <a class="text-bold" href="post.php?download_client_locations_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
diff --git a/client_login_import_modal.php b/client_login_import_modal.php
index edf7edc4..566ccdda 100644
--- a/client_login_import_modal.php
+++ b/client_login_import_modal.php
@@ -13,7 +13,7 @@
 					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, URL</p>
 					<hr>
 					<div class="form-group my-4">
-						<input type="file" class="form-control-file" name="file" accept=".csv">
+						<input type="file" class="form-control-file" name="file" accept=".csv" required>
 					</div>
 					<hr>
 					<div>Download <a class="text-bold" href="post.php?download_client_logins_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
diff --git a/post/user/asset.php b/post/user/asset.php
index 9a1885ba..b9ee2c4b 100644
--- a/post/user/asset.php
+++ b/post/user/asset.php
@@ -473,8 +473,18 @@ if (isset($_POST["import_client_assets_csv"])) {
 
     $client_id = intval($_POST['client_id']);
     $file_name = $_FILES["file"]["tmp_name"];
+
     $error = false;
 
+    if (!empty($_FILES["file"]["tmp_name"])) {
+        $file_name = $_FILES["file"]["tmp_name"];
+    } else {
+        $_SESSION['alert_message'] = "Please select a file to upload.";
+        $_SESSION['alert_type'] = "error";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
+        exit();
+    }
+
     //Check file is CSV
     $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
     $allowed_file_extensions = array('csv');
diff --git a/post/user/client.php b/post/user/client.php
index d497b25a..60f839ac 100644
--- a/post/user/client.php
+++ b/post/user/client.php
@@ -387,10 +387,17 @@ if (isset($_POST['export_clients_csv'])) {
 if (isset($_POST["import_clients_csv"])) {
 
     enforceUserPermission('module_client', 2);
-
-    $file_name = $_FILES["file"]["tmp_name"];
     $error = false;
 
+    if (!empty($_FILES["file"]["tmp_name"])) {
+        $file_name = $_FILES["file"]["tmp_name"];
+    } else {
+        $_SESSION['alert_message'] = "Please select a file to upload.";
+        $_SESSION['alert_type'] = "error";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
+        exit();
+    }
+
     //Check file is CSV
     $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
     $allowed_file_extensions = array('csv');
@@ -589,7 +596,7 @@ if (isset($_POST["import_clients_csv"])) {
 if (isset($_GET['download_clients_csv_template'])) {
 
     $delimiter = ",";
-    $filename = strtoAZaz09($client_name) . "-Clients-Template.csv";
+    $filename = "Clients-Template.csv";
 
     //create a file pointer
     $f = fopen('php://memory', 'w');
diff --git a/post/user/contact.php b/post/user/contact.php
index a537a842..d5fbe7fc 100644
--- a/post/user/contact.php
+++ b/post/user/contact.php
@@ -822,9 +822,17 @@ if (isset($_POST["import_client_contacts_csv"])) {
     enforceUserPermission('module_client', 2);
 
     $client_id = intval($_POST['client_id']);
-    $file_name = $_FILES["file"]["tmp_name"];
     $error = false;
 
+    if (!empty($_FILES["file"]["tmp_name"])) {
+        $file_name = $_FILES["file"]["tmp_name"];
+    } else {
+        $_SESSION['alert_message'] = "Please select a file to upload.";
+        $_SESSION['alert_type'] = "error";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
+        exit();
+    }
+
     //Check file is CSV
     $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
     $allowed_file_extensions = array('csv');
diff --git a/post/user/credential.php b/post/user/credential.php
index 491b3b1a..cce38199 100644
--- a/post/user/credential.php
+++ b/post/user/credential.php
@@ -377,9 +377,17 @@ if (isset($_POST["import_client_logins_csv"])) {
     enforceUserPermission('module_credential', 2);
 
     $client_id = intval($_POST['client_id']);
-    $file_name = $_FILES["file"]["tmp_name"];
     $error = false;
 
+    if (!empty($_FILES["file"]["tmp_name"])) {
+        $file_name = $_FILES["file"]["tmp_name"];
+    } else {
+        $_SESSION['alert_message'] = "Please select a file to upload.";
+        $_SESSION['alert_type'] = "error";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
+        exit();
+    }
+
     //Check file is CSV
     $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
     $allowed_file_extensions = array('csv');
diff --git a/post/user/location.php b/post/user/location.php
index 6cedd3ed..6df8c008 100644
--- a/post/user/location.php
+++ b/post/user/location.php
@@ -429,9 +429,17 @@ if(isset($_POST["import_client_locations_csv"])){
     enforceUserPermission('module_client', 2);
 
     $client_id = intval($_POST['client_id']);
-    $file_name = $_FILES["file"]["tmp_name"];
     $error = false;
 
+    if (!empty($_FILES["file"]["tmp_name"])) {
+        $file_name = $_FILES["file"]["tmp_name"];
+    } else {
+        $_SESSION['alert_message'] = "Please select a file to upload.";
+        $_SESSION['alert_type'] = "error";
+        header("Location: " . $_SERVER["HTTP_REFERER"]);
+        exit();
+    }
+
     //Check file is CSV
     $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
     $allowed_file_extensions = array('csv');