diff --git a/client_location_add_modal.php b/client_location_add_modal.php
index 2cd48607..8841017a 100644
--- a/client_location_add_modal.php
+++ b/client_location_add_modal.php
@@ -9,6 +9,7 @@
             </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">
 
                     <ul class="nav nav-pills nav-justified mb-3">
diff --git a/post/user/location.php b/post/user/location.php
index 03baef26..7d022a1e 100644
--- a/post/user/location.php
+++ b/post/user/location.php
@@ -47,17 +47,13 @@ if(isset($_POST['add_location'])){
 
             mysqli_query($mysqli,"UPDATE locations SET location_photo = '$new_file_name' WHERE location_id = $location_id");
 
-            $_SESSION['alert_message'] = 'File successfully uploaded.';
-        }else{
-
-            $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
         }
     }
 
     // Logging
     logAction("Location", "Create", "$session_name created location $name", $client_id, $location_id);
 
-    $_SESSION['alert_message'] .= "Location <strong>$name</strong> created.";
+    $_SESSION['alert_message'] = "Location <strong>$name</strong> created.";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
@@ -120,17 +116,13 @@ if(isset($_POST['edit_location'])){
 
             mysqli_query($mysqli,"UPDATE locations SET location_photo = '$new_file_name' WHERE location_id = $location_id");
 
-            $_SESSION['alert_message'] = 'File successfully uploaded.';
-        }else{
-
-            $_SESSION['alert_message'] = 'There was an error moving the file to upload directory. Please make sure the upload directory is writable by web server.';
         }
     }
 
     // Logging
     logAction("Location", "Edit", "$session_name edited location $name", $client_id, $location_id);
 
-    $_SESSION['alert_message'] .= "Location <strong>$name</strong> updated";
+    $_SESSION['alert_message'] = "Location <strong>$name</strong> updated";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
diff --git a/post/user/location_model.php b/post/user/location_model.php
index ecfd7eaf..7d74a198 100644
--- a/post/user/location_model.php
+++ b/post/user/location_model.php
@@ -11,4 +11,4 @@ $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
 $hours = sanitizeInput($_POST['hours']);
 $notes = sanitizeInput($_POST['notes']);
 $contact = intval($_POST['contact']);
-$location_primary = intval($_POST['location_primary']);
+$location_primary = intval($_POST['location_primary'] ?? 0);
diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index dca10cb2..35f21f62 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -9,6 +9,8 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="billable" value="0">
+                <input type="hidden" name="use_primary_contact" value="0">
+                
                 <div class="modal-body bg-white">
 
                     <?php if (isset($_GET['client_id'])) { ?>