diff --git a/api/v1/clients/create.php b/api/v1/clients/create.php
index dcffd710..eafd7daa 100644
--- a/api/v1/clients/create.php
+++ b/api/v1/clients/create.php
@@ -20,9 +20,10 @@ if (!empty($name) && $client_id == 0) {
     // Check insert & get insert ID
     if ($insert_sql) {
         $insert_id = mysqli_insert_id($mysqli);
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Created', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $insert_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created client $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $insert_id");
+        
+        // Logging
+        logAction("Client", "Create", "$name via API ($api_key_name)", $insert_id);
+        logAction("API", "Success", "Created client $name via API ($api_key_name)", $insert_id);
     }
 
 }
diff --git a/api/v1/contacts/create.php b/api/v1/contacts/create.php
index 02301b21..45f3b78f 100644
--- a/api/v1/contacts/create.php
+++ b/api/v1/contacts/create.php
@@ -25,9 +25,10 @@ if (!empty($name) && !empty($email) && !empty($client_id)) {
         // Check insert & get insert ID
         if ($insert_sql) {
             $insert_id = mysqli_insert_id($mysqli);
-            //Logging
-            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Created', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created contact $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+            
+            // Logging
+            logAction("Contact", "Create", "$name via API ($api_key_name)", $client_id, $insert_id);
+            logAction("API", "Success", "Created contact $name via API ($api_key_name)", $client_id);
         }
 
     }
diff --git a/api/v1/contacts/delete.php b/api/v1/contacts/delete.php
index 1729148d..62309277 100644
--- a/api/v1/contacts/delete.php
+++ b/api/v1/contacts/delete.php
@@ -21,8 +21,8 @@ if (!empty($contact_id)) {
     if ($delete_sql && !empty($contact_name)) {
         $delete_count = mysqli_affected_rows($mysqli);
 
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Deleted', log_description = '$contact_name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        // Logging
+        logAction("Contact", "Delete", "$contact_name via API ($api_key_name)", $client_id);
     }
 }
 
diff --git a/api/v1/contacts/update.php b/api/v1/contacts/update.php
index 8e7e28e0..eb9e4c45 100644
--- a/api/v1/contacts/update.php
+++ b/api/v1/contacts/update.php
@@ -25,12 +25,11 @@ if (!empty($contact_id)) {
     if ($update_sql) {
         $update_count = mysqli_affected_rows($mysqli);
 
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Updated', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Updated contact $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        // Logging
+        logAction("Contact", "Edit", "$name via API ($api_key_name)", $client_id, $contact_id);
+        logAction("API", "Success", "Edited contact $name via API ($api_key_name)", $client_id);
     }
 }
 
 // Output
 require_once '../update_output.php';
-
diff --git a/api/v1/credentials/create.php b/api/v1/credentials/create.php
index 66140df1..ba4c6e0e 100644
--- a/api/v1/credentials/create.php
+++ b/api/v1/credentials/create.php
@@ -19,9 +19,9 @@ if (!empty($api_key_decrypt_password) && !empty($name) && !(empty($password))) {
     if ($insert_sql) {
         $insert_id = mysqli_insert_id($mysqli);
 
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Credential', log_action = 'Create', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created credential $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        // Logging
+        logAction("Credential", "Create", "$name via API ($api_key_name)", $client_id, $insert_id);
+        logAction("API", "Success", "Created credential $name via API ($api_key_name)", $client_id);
     }
 
 }
diff --git a/api/v1/credentials/update.php b/api/v1/credentials/update.php
index 489ef8b0..dfe59c45 100644
--- a/api/v1/credentials/update.php
+++ b/api/v1/credentials/update.php
@@ -27,9 +27,9 @@ if (!empty($_POST['api_key_decrypt_password']) && !empty($login_id)) {
             mysqli_query($mysqli, "UPDATE logins SET login_password_changed_at = NOW() WHERE login_id = $login_id LIMIT 1");
         }
 
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Credential', log_action = 'Update', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Updated credential $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        // Logging
+        logAction("Credential", "Edit", "$name via API ($api_key_name)", $client_id, $login_id);
+        logAction("API", "Success", "Updated credential $name via API ($api_key_name)", $client_id);
     }
 
 }
diff --git a/api/v1/documents/create.php b/api/v1/documents/create.php
index 9b540885..82d9f7e5 100644
--- a/api/v1/documents/create.php
+++ b/api/v1/documents/create.php
@@ -22,13 +22,12 @@ if (!empty($name) && !(empty($content))) {
         // Update field document_parent to be the same id as document ID as this is the only version of the document.
         mysqli_query($mysqli,"UPDATE documents SET document_parent = $insert_id WHERE document_id = $insert_id");
 
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Document', log_action = 'Create', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created document $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        // Logging
+        logAction("Document", "Create", "$name via API ($api_key_name)", $client_id, $insert_id);
+        logAction("API", "Success", "Created document $name via API ($api_key_name)", $client_id);
     }
 
 }
 
-
 // Output
 require_once '../create_output.php';
diff --git a/api/v1/documents/update.php b/api/v1/documents/update.php
index ec007cb3..63bd9939 100644
--- a/api/v1/documents/update.php
+++ b/api/v1/documents/update.php
@@ -46,9 +46,9 @@ if (!empty($document_id)) {
         // Vendor documents
         mysqli_query($mysqli,"UPDATE vendor_documents SET document_id = $new_document_id WHERE document_id = $document_id");
 
-        //Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Document', log_action = 'Modify', log_description = '$name via API ($api_key_name) previous version was kept', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Edited document $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        // Logging
+        logAction("Document", "Edit", "$name via API ($api_key_name) previous version kept", $client_id, $insert_id);
+        logAction("API", "Success", "Edited document $name via API ($api_key_name)", $client_id);
 
         // Override update count to 1 for API to report a success (as we inserted a document, not "updated" an existing row)
         $update_count = 1;
@@ -56,6 +56,5 @@ if (!empty($document_id)) {
 
 }
 
-
 // Output
 require_once '../update_output.php';
diff --git a/api/v1/tickets/create.php b/api/v1/tickets/create.php
index 13da7242..5b6d117f 100644
--- a/api/v1/tickets/create.php
+++ b/api/v1/tickets/create.php
@@ -4,7 +4,6 @@ require_once '../validate_api_key.php';
 
 require_once '../require_post_method.php';
 
-
 // Ticket-related settings
 require_once "../../../get_settings.php";
 
@@ -17,7 +16,6 @@ $company_phone = formatPhoneNumber($row['company_phone']);
 $ticket_row = false; // Creation, not an update
 require_once 'ticket_model.php';
 
-
 // Default
 $insert_id = false;
 
@@ -41,13 +39,13 @@ if (!empty($subject) && !empty($client_id)) {
     // Check insert & get insert ID
     if ($insert_sql) {
         $insert_id = mysqli_insert_id($mysqli);
+
         // Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Created ticket $config_ticket_prefix$ticket_number $subject via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created ticket $config_ticket_prefix$ticket_number via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id");
+        logAction("Ticket", "Create", "Created ticket $config_ticket_prefix$ticket_number $subject via API ($api_key_name)", $client_id, $insert_id);
+        logAction("API", "Success", "Created ticket $config_ticket_prefix$ticket_number $subject via API ($api_key_name)", $client_id);
     }
 
 }
 
 // Output
 require_once '../create_output.php';
-