diff --git a/agent/modals/contact/contact_edit.php b/agent/modals/contact/contact_edit.php
index b22e21b5..d370ae67 100644
--- a/agent/modals/contact/contact_edit.php
+++ b/agent/modals/contact/contact_edit.php
@@ -55,7 +55,7 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+
     <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
diff --git a/agent/modals/location/location_edit.php b/agent/modals/location/location_edit.php
index 9b83f322..9c11baaf 100644
--- a/agent/modals/location/location_edit.php
+++ b/agent/modals/location/location_edit.php
@@ -49,7 +49,6 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="location_id" value="<?php echo $location_id; ?>">
-    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
     <div class="modal-body">
 
diff --git a/agent/modals/network/network_edit.php b/agent/modals/network/network_edit.php
index 690748ec..33c9bd74 100644
--- a/agent/modals/network/network_edit.php
+++ b/agent/modals/network/network_edit.php
@@ -31,7 +31,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="network_id" value="<?= $network_id ?>">
-    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+
     <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
diff --git a/agent/post/asset.php b/agent/post/asset.php
index 4c83b5e2..8f01972b 100644
--- a/agent/post/asset.php
+++ b/agent/post/asset.php
@@ -14,6 +14,8 @@ if (isset($_POST['add_asset'])) {
 
     require_once 'asset_model.php';
 
+    $client_id = intval($_POST['client_id']);
+
     enforceClientAccess();
 
     $alert_extended = "";
diff --git a/agent/post/asset_model.php b/agent/post/asset_model.php
index e50b7106..1fd4a4b2 100644
--- a/agent/post/asset_model.php
+++ b/agent/post/asset_model.php
@@ -46,4 +46,3 @@ if (empty($install_date)) {
 }
 $notes = sanitizeInput($_POST['notes']);
 $favorite = intval($_POST['favorite'] ?? 0);
-$client_id = intval($_POST['client_id']);
diff --git a/agent/post/contact.php b/agent/post/contact.php
index 2310e559..010de96b 100644
--- a/agent/post/contact.php
+++ b/agent/post/contact.php
@@ -14,6 +14,8 @@ if (isset($_POST['add_contact'])) {
 
     require_once 'contact_model.php';
 
+    $client_id = intval($_POST['client_id']);
+
     enforceClientAccess($client_id);
 
     // Create User Account
@@ -88,16 +90,17 @@ if (isset($_POST['edit_contact'])) {
 
     require_once 'contact_model.php';
 
-    enforceClientAccess();
-
     $contact_id = intval($_POST['contact_id']);
     $send_email = intval($_POST['send_email'] ?? 0);
 
-    // Get Exisiting Contact Photo and contact_user_id
-    $sql = mysqli_query($mysqli,"SELECT contact_photo, contact_user_id FROM contacts WHERE contact_id = $contact_id");
+    // Get Contact Info
+    $sql = mysqli_query($mysqli,"SELECT contact_photo, contact_user_id, contact_client_id FROM contacts WHERE contact_id = $contact_id");
     $row = mysqli_fetch_assoc($sql);
     $existing_file_name = sanitizeInput($row['contact_photo']);
     $contact_user_id = intval($row['contact_user_id']);
+    $client_id = intval($row['contact_client_id']);
+
+    enforceClientAccess();
 
     if (!file_exists("../uploads/clients/$client_id")) {
         mkdir("../uploads/clients/$client_id");
diff --git a/agent/post/contact_model.php b/agent/post/contact_model.php
index 31c70cd8..dde1a191 100644
--- a/agent/post/contact_model.php
+++ b/agent/post/contact_model.php
@@ -1,7 +1,6 @@
 <?php
 defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
-$client_id = intval($_POST['client_id']);
 $name = sanitizeInput($_POST['name']);
 $title = sanitizeInput($_POST['title']);
 $department = sanitizeInput($_POST['department']);
@@ -19,4 +18,3 @@ $contact_technical = intval($_POST['contact_technical'] ?? 0);
 $location_id = intval($_POST['location'] ?? 0);
 $pin = sanitizeInput($_POST['pin']);
 $auth_method = sanitizeInput($_POST['auth_method']);
-
diff --git a/agent/post/location.php b/agent/post/location.php
index e93f77c7..0a710f39 100644
--- a/agent/post/location.php
+++ b/agent/post/location.php
@@ -14,6 +14,8 @@ if(isset($_POST['add_location'])){
 
     require_once 'location_model.php';
 
+    $client_id = intval($_POST['client_id']);
+
     enforceClientAccess();
 
     if(!file_exists("../uploads/clients/$client_id")) {
diff --git a/agent/post/location_model.php b/agent/post/location_model.php
index a62147f8..eb062182 100644
--- a/agent/post/location_model.php
+++ b/agent/post/location_model.php
@@ -1,7 +1,6 @@
 <?php
 defined('FROM_POST_HANDLER') || die("Direct file access is not allowed");
 
-$client_id = intval($_POST['client_id']);
 $name = sanitizeInput($_POST['name']);
 $description = sanitizeInput($_POST['description']);
 $country = sanitizeInput($_POST['country']);