diff --git a/check_login.php b/check_login.php
index a1cde93f..57c5bd36 100644
--- a/check_login.php
+++ b/check_login.php
@@ -73,12 +73,12 @@ try {
     $user_client_access_sql = "SELECT client_id FROM user_permissions WHERE user_id = $session_user_id";
     $user_client_access_result = mysqli_query($mysqli, $user_client_access_sql);
 
-    $access_client_ids = [];
+    $client_access_array = [];
     while ($row = mysqli_fetch_assoc($user_client_access_result)) {
-        $access_client_ids[] = $row['client_id'];
+        $client_access_array[] = $row['client_id'];
     }
 
-    $client_access_string = implode(',', $access_client_ids);
+    $client_access_string = implode(',', $client_access_array);
 
     // Role / Client Access Permission Check
     if ($session_user_role < 3 && !empty($client_access_string)) {
diff --git a/inc_all_client.php b/inc_all_client.php
index 3d548b6d..0ed1b186 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -6,14 +6,15 @@ require_once "functions.php";
 
 require_once "check_login.php";
 
-require_once "header.php";
-
-require_once "top_nav.php";
-
-
 if (isset($_GET['client_id'])) {
     $client_id = intval($_GET['client_id']);
 
+    // Check to see if the logged in user has permission to access this client (Admins have access to all no matter what perms are set)
+    if(!in_array($client_id, $client_access_array) AND !empty($client_access_string) AND $session_user_role < 3) {
+        echo "You don't have permission to access this client";
+        exit();
+    }
+
     $sql = mysqli_query($mysqli, "UPDATE clients SET client_accessed_at = NOW() WHERE client_id = $client_id");
 
     $sql = mysqli_query(
@@ -231,6 +232,10 @@ if (isset($_GET['client_id'])) {
     }
 }
 
+require_once "header.php";
+
+require_once "top_nav.php";
+
 require_once "client_side_nav.php";
 
 require_once "inc_wrapper.php";