diff --git a/add_contact_modal.php b/add_contact_modal.php
index ef1661db..190c207d 100644
--- a/add_contact_modal.php
+++ b/add_contact_modal.php
@@ -91,6 +91,30 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Location</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                  </div>
+                  <select class="form-control select2" name="location">
+                    <option value="">- Location -</option>
+                    <?php 
+                    
+                    $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC"); 
+                    while($row = mysqli_fetch_array($sql)){
+                      $location_id = $row['location_id'];
+                      $location_name = $row['location_name'];
+                    ?>
+                    <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-photo">
diff --git a/client_contacts.php b/client_contacts.php
index 2c5bdb65..c7516194 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -39,7 +39,11 @@ if(isset($_GET['o'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM contacts WHERE contact_archived_at IS NULL AND (contact_name LIKE '%$q%') AND contact_client_id = $client_id ORDER BY $sb $o LIMIT $record_from, $record_to");
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM contacts 
+  LEFT JOIN locations ON location_id = contact_location_id
+  WHERE contact_archived_at IS NULL 
+  AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%' OR contact_phone LIKE '%$q%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$q%' OR contact_email LIKE '%$q%') 
+  AND contact_client_id = $client_id ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
@@ -86,6 +90,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_email&o=<?php echo $disp; ?>">Email</a></th>
             <th>Phone</th>
             <th>Mobile</th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_name&o=<?php echo $disp; ?>">Location</a></th>
             <th class="text-center">Action</th>
           </tr>
         </thead>
@@ -128,7 +133,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
             }else{
               $primary_contact_display = "<small class='text-danger'>Needs approval</small>";
-            }            
+            }
+            $contact_location_id = $row['contact_location_id'];
+            $location_name = $row['location_name'];
+            if(empty($location_name)){
+              $location_name_display = "-";
+            }else{
+              $location_name_display = $location_name;
+            }          
       
           ?>
           <tr>
@@ -156,6 +168,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $contact_email_display; ?></td>
             <td><?php echo $contact_phone_display; ?> <?php if(!empty($contact_extension)){ echo "x$contact_extension"; } ?></td>
             <td><?php echo $contact_mobile_display; ?></td>
+            <td><?php echo $location_name_display; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/edit_contact_modal.php b/edit_contact_modal.php
index 644d2bdb..69855814 100644
--- a/edit_contact_modal.php
+++ b/edit_contact_modal.php
@@ -93,6 +93,30 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Location</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                  </div>
+                  <select class="form-control select2" name="location">
+                    <option value="">- Location -</option>
+                    <?php 
+                    
+                    $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE (location_archived_at > '$network_created_at' OR location_archived_at IS NULL) AND location_client_id = $client_id ORDER BY location_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_locations)){
+                      $location_id_select = $row['location_id'];
+                      $location_name_select = $row['location_name'];
+                    ?>
+                    <option <?php if($contact_location_id == $location_id_select){ echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
diff --git a/post.php b/post.php
index 70b1952a..43dc0469 100644
--- a/post.php
+++ b/post.php
@@ -3934,12 +3934,13 @@ if(isset($_POST['add_contact'])){
     $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
     $primary_contact = intval($_POST['primary_contact']);
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
+    $location_id = intval($_POST['location']);
 
     if(!file_exists("uploads/clients/$session_company_id/$client_id")) {
         mkdir("uploads/clients/$session_company_id/$client_id");
     }
 
-    mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_created_at = NOW(), contact_client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_created_at = NOW(), contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id");
 
     $contact_id = mysqli_insert_id($mysqli);
 
@@ -4011,6 +4012,7 @@ if(isset($_POST['edit_contact'])){
     $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
     $primary_contact = intval($_POST['primary_contact']);
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
+    $location_id = intval($_POST['location']);
 
     $existing_file_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['existing_file_name']));
 
@@ -4018,7 +4020,7 @@ if(isset($_POST['edit_contact'])){
         mkdir("uploads/clients/$session_company_id/$client_id");
     }
 
-    mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_updated_at = NOW() WHERE contact_id = $contact_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_location_id = $location_id, contact_updated_at = NOW() WHERE contact_id = $contact_id AND company_id = $session_company_id");
 
     //Update Primay contact in clients if primary contact is checked
     if($primary_contact > 0){