diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index b3f08d35..66eb7954 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -1,207 +1,213 @@
 <div class="modal" id="addContactModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-user-plus"></i> New Contact</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </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">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-portal">Portal</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details"> 
-          
-              <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Full Name" required autofocus>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="primary_contact" value="1" <?php if ($primary_contact == 0) { echo "checked"; } ?>>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Title</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Department</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="department" placeholder="Department">
-                </div>
-              </div>
-            
-              <label>Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number"> 
-                    </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Extension">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Mobile</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                  </div>
-                  <input type="email" class="form-control" name="email" placeholder="Email Address">
-                </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 = htmlentities($row['location_name']);
-                    ?>
-                    <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-row">
-                
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1" >
-                      <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1" >
-                      <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1" >
-                      <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
-                    </div>
-                  </div>
-                </div>
-              
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-plus"></i> New Contact</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <!-- Prevent undefined checkbox errors on submit -->
+                <input type="hidden" name="primary_contact" value="0">
+                <input type="hidden" name="contact_important" value="0">
+                <input type="hidden" name="contact_billing" value="0">
+                <input type="hidden" name="contact_technical" value="0">
+                <!-- End prevent undefined errors -->
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-photo">
-              
-              <div class="form-group">
-                <label>Upload Photo</label>
-                <input type="file" class="form-control-file" name="file">
-              </div>
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-portal">Portal</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+                        </li>
+                    </ul>
 
-            </div>
+                    <hr>
 
-            <div class="tab-pane fade" id="pills-portal"> 
+                    <div class="tab-content">
+
+                        <div class="tab-pane fade show active" id="pills-details">
+
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Full Name" required autofocus>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="primary_contact" value="1" <?php if ($primary_contact == 0) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Title</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" placeholder="Title">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Department</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="department" placeholder="Department">
+                                </div>
+                            </div>
+
+                            <label>Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="extension" placeholder="Extension">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Mobile</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                                    </div>
+                                    <input type="email" class="form-control" name="email" placeholder="Email Address">
+                                </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 = htmlentities($row['location_name']);
+                                            ?>
+                                            <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+
+                                            <?php
+                                        }
+                                        ?>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="form-row">
+
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1" >
+                                            <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1" >
+                                            <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1" >
+                                            <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-photo">
+
+                            <div class="form-group">
+                                <label>Upload Photo</label>
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-portal">
+
+                            <div class="form-group">
+                                <label>Login</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="auth_method">
+                                        <option value="">- None -</option>
+                                        <option value="local">Local</option>
+                                        <option value="azure">Azure</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-notes">
+
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
+                            </div>
+
+                        </div>
+
+                    </div>
 
-              <div class="form-group">
-                <label>Login</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
-                  </div>
-                  <select class="form-control select2" name="auth_method">
-                    <option value="">- None -</option>
-                    <option value="local">Local</option>
-                    <option value="azure">Azure</option>
-                  </select>
                 </div>
-              </div>
-
-            </div>
-
-            <div class="tab-pane fade" id="pills-notes">
-              
-              <div class="form-group">
-                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
-              </div>
-            
-            </div>
-          
-          </div>
-        
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="add_contact" class="btn btn-primary text-bold"><i class="fas fa-check"></i> Create</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_contact" class="btn btn-primary text-bold"><i class="fas fa-check"></i> Create</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index 80cbe29a..34a5cba0 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -1,241 +1,247 @@
 <div class="modal" id="editContactModal<?php echo $contact_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> Editing: <strong><?php echo $contact_name; ?></strong></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-        <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <input type="hidden" name="existing_file_name" value="<?php echo $contact_photo; ?>">
-        <div class="modal-body bg-white">
-
-          <ul class="nav nav-pills nav-justified mb-3">
-            <li class="nav-item">
-              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $contact_id; ?>">Details</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-portal<?php echo $contact_id; ?>">Portal</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
-            </li>
-          </ul>
-
-          <hr>
-          
-          <div class="tab-content">
-
-            <div class="tab-pane fade show active" id="pills-details<?php echo $contact_id; ?>">
-
-              <div class="form-group">
-                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="name" placeholder="Full Name" value="<?php echo $contact_name; ?>" required>
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="primary_contact" value="1" <?php if ($contact_id == $primary_contact) { echo "checked"; } ?>>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Title</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title" value="<?php echo $contact_title; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Department</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="department" placeholder="Department" value="<?php echo $contact_department; ?>">
-                </div>
-              </div>
-
-              <label>Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $contact_phone; ?>"> 
-                    </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $contact_extension; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Mobile</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" value="<?php echo $contact_mobile; ?>"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                  </div>
-                  <input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo $contact_email; ?>">
-                </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 > '$contact_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 = htmlentities($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 class="form-row">
-                
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?> >
-                      <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?> >
-                      <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
-                    </div>
-                  </div>
-                </div>
-                <div class="col-md-4">
-                  <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?> >
-                      <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
-                    </div>
-                  </div>
-                </div>
-              
-              </div>
-
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> Editing: <strong><?php echo $contact_name; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
             </div>
+            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+                <!-- Prevent undefined checkbox errors on submit -->
+                <input type="hidden" name="primary_contact" value="0">
+                <input type="hidden" name="contact_important" value="0">
+                <input type="hidden" name="contact_billing" value="0">
+                <input type="hidden" name="contact_technical" value="0">
+                <!-- End prevent undefined errors -->
+                <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
+                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <input type="hidden" name="existing_file_name" value="<?php echo $contact_photo; ?>">
+                <div class="modal-body bg-white">
 
-            <div class="tab-pane fade" id="pills-portal<?php echo $contact_id; ?>">
+                    <ul class="nav nav-pills nav-justified mb-3">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $contact_id; ?>">Details</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-portal<?php echo $contact_id; ?>">Portal</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
+                        </li>
+                    </ul>
 
-              <div class="form-group">
-                <label>Login</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
-                  </div>
-                  <select class="form-control select2" name="auth_method">
-                    <option value="">- None -</option>
-                    <option value="local" <?php if ($auth_method == "local") {echo "selected";} ?>>Local</option>
-                    <option value="azure" <?php if ($auth_method == "azure") {echo "selected";} ?>>Azure</option>
-                  </select>
-                </div>
-              </div>
+                    <hr>
 
-              <?php if ($auth_method == "local") { ?>
+                    <div class="tab-content">
 
-                <div class="form-group">
-                  <label>Password</label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                    </div>
-                    <input type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Leave blank for no change" autocomplete="new-password">
-                    <div class="input-group-append">
-                      <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                    </div>
-                  </div>
-                </div>
+                        <div class="tab-pane fade show active" id="pills-details<?php echo $contact_id; ?>">
 
-              <?php } ?>
+                            <div class="form-group">
+                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="Full Name" value="<?php echo $contact_name; ?>" required>
+                                    <div class="input-group-append">
+                                        <div class="input-group-text">
+                                            <input type="checkbox" name="primary_contact" value="1" <?php if ($contact_id == $primary_contact) { echo "checked"; } ?>>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
 
-              <div class="form-check">
-                <input type="checkbox" class="form-check-input" name="send_email" value=""/>
-                <label class="form-check-label">Send user e-mail with login details?</label>
-              </div>
+                            <div class="form-group">
+                                <label>Title</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="title" placeholder="Title" value="<?php echo $contact_title; ?>">
+                                </div>
+                            </div>
 
-            </div>
+                            <div class="form-group">
+                                <label>Department</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="department" placeholder="Department" value="<?php echo $contact_department; ?>">
+                                </div>
+                            </div>
 
-            <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
+                            <label>Phone</label>
+                            <div class="form-row">
+                                <div class="col-8">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $contact_phone; ?>">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-4">
+                                    <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $contact_extension; ?>">
+                                </div>
+                            </div>
 
-              <div class="mb-3 text-center">
-                <?php if (!empty($contact_photo)) { ?>
-                <img class="img-fluid" alt="contact_photo" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
-                <?php }else{ ?>
-                <span class="fa-stack fa-4x">
+                            <div class="form-group">
+                                <label>Mobile</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" value="<?php echo $contact_mobile; ?>">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                                    </div>
+                                    <input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo $contact_email; ?>">
+                                </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 > '$contact_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 = htmlentities($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 class="form-row">
+
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?> >
+                                            <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?> >
+                                            <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?> >
+                                            <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-portal<?php echo $contact_id; ?>">
+
+                            <div class="form-group">
+                                <label>Login</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
+                                    </div>
+                                    <select class="form-control select2" name="auth_method">
+                                        <option value="">- None -</option>
+                                        <option value="local" <?php if ($auth_method == "local") {echo "selected";} ?>>Local</option>
+                                        <option value="azure" <?php if ($auth_method == "azure") {echo "selected";} ?>>Azure</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <?php if ($auth_method == "local") { ?>
+
+                                <div class="form-group">
+                                    <label>Password</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                                        </div>
+                                        <input type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Leave blank for no change" autocomplete="new-password">
+                                        <div class="input-group-append">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input" name="send_email" value=""/>
+                                <label class="form-check-label">Send user e-mail with login details?</label>
+                            </div>
+
+                        </div>
+
+                        <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
+
+                            <div class="mb-3 text-center">
+                                <?php if (!empty($contact_photo)) { ?>
+                                    <img class="img-fluid" alt="contact_photo" src="<?php echo "uploads/clients/$session_company_id/$client_id/$contact_photo"; ?>">
+                                <?php }else{ ?>
+                                    <span class="fa-stack fa-4x">
                   <i class="fa fa-circle fa-stack-2x text-secondary"></i>
                   <span class="fa fa-stack-1x text-white"><?php echo $contact_initials; ?></span>
                 </span>
-                <?php } ?>
-              </div>
+                                <?php } ?>
+                            </div>
 
-              <div class="form-group">
-                <input type="file" class="form-control-file" name="file">
-              </div>
+                            <div class="form-group">
+                                <input type="file" class="form-control-file" name="file">
+                            </div>
 
-            </div>
+                        </div>
 
-            <div class="tab-pane fade" id="pills-notes<?php echo $contact_id; ?>">
-              
-              <div class="form-group">
-                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
-              </div>
+                        <div class="tab-pane fade" id="pills-notes<?php echo $contact_id; ?>">
 
-            </div>
+                            <div class="form-group">
+                                <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
+                            </div>
 
-          </div>
+                        </div>
 
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" name="edit_contact" class="btn btn-primary"><i class="fas fa-check"></i> Save</button>
+                </div>
+            </form>
         </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_contact" class="btn btn-primary"><i class="fas fa-check"></i> Save</button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/guest_header.php b/guest_header.php
index 0fc66cca..141bb1bf 100644
--- a/guest_header.php
+++ b/guest_header.php
@@ -1,64 +1,62 @@
-<?php 
+<?php
 
-include("config.php");
-include("functions.php");
+require_once("config.php");
+require_once("functions.php");
 
 session_start();
 
-$ip = trim(strip_tags(mysqli_real_escape_string($mysqli,getIP())));
-$user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_AGENT']));
+$ip = trim(strip_tags(mysqli_real_escape_string($mysqli, getIP())));
+$user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT']));
 
 ?>
 
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="x-ua-compatible" content="ie=edge">
-  <meta name="robots" content="noindex">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="robots" content="noindex">
 
-  <title><?php echo $config_app_name; ?></title>
+    <title><?php echo $config_app_name; ?></title>
 
-  <!-- Font Awesome Icons -->
-  <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">
-  <!-- Theme style -->
-  <link rel="stylesheet" href="dist/css/adminlte.min.css">
-  <!-- Google Font: Source Sans Pro -->
-  <!-- <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> -->
+    <!-- Font Awesome Icons -->
+    <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">
+    <!-- Theme style -->
+    <link rel="stylesheet" href="dist/css/adminlte.min.css">
 
-  <!-- Custom Style Sheet -->
-  <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-  <link href="plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-  <link href="plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-  <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
+    <!-- Custom Style Sheet -->
+    <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
+    <link href="plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
 
 </head>
 <body class="layout-top-nav">
-  <div class="wrapper text-sm">
-    
+<div class="wrapper text-sm">
+
     <!-- Content Wrapper. Contains page content -->
     <div class="content-wrapper">
 
-      <!-- Main content -->
-      <div class="content">
-        <div class="container">
+        <!-- Main content -->
+        <div class="content">
+            <div class="container">
 
-          <?php
-          //Alert Feedback
-          if (!empty($_SESSION['alert_message'])) {
-              if (!isset($_SESSION['alert_type'])) {
-                  $_SESSION['alert_type'] = "info";
-              }
-            ?>
-              <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
-                <?php echo $_SESSION['alert_message']; ?>
-                <button class='close' data-dismiss='alert'>&times;</button>
-              </div>
-            <?php
-            
-            unset($_SESSION['alert_type']);
-            unset($_SESSION['alert_message']);
+                <?php
+                //Alert Feedback
+                if (!empty($_SESSION['alert_message'])) {
+                    if (!isset($_SESSION['alert_type'])) {
+                        $_SESSION['alert_type'] = "info";
+                    }
+                    ?>
+                    <div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
+                        <?php echo $_SESSION['alert_message']; ?>
+                        <button class='close' data-dismiss='alert'>&times;</button>
+                    </div>
+                    <?php
 
-          }
-          ?>
+                    unset($_SESSION['alert_type']);
+                    unset($_SESSION['alert_message']);
+
+                }
+                ?>
diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index df3c074f..549964d5 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -1,4 +1,6 @@
-<?php include("guest_header.php");
+<?php
+
+require_once("guest_header.php");
 
 if (isset($_GET['invoice_id'], $_GET['url_key'])) {
 
@@ -71,6 +73,8 @@ if (isset($_GET['invoice_id'], $_GET['url_key'])) {
         $os = strip_tags(mysqli_real_escape_string($mysqli,getOS($session_user_agent)));
         $browser = strip_tags(mysqli_real_escape_string($mysqli,getWebBrowser($session_user_agent)));
 
+        $invoice_tally_total = 0; // Default
+
         //Set Badge color based off of invoice status
         if ($invoice_status == "Sent") {
             $invoice_badge_color = "warning text-white";
@@ -108,6 +112,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key'])) {
         $balance = $invoice_amount - $amount_paid;
 
         //check to see if overdue
+        $invoice_color = $invoice_badge_color; // Default
         if ($invoice_status !== "Paid" && $invoice_status !== "Draft" && $invoice_status !== "Cancelled") {
             $unixtime_invoice_due = strtotime($invoice_due) + 86400;
             if ($unixtime_invoice_due < time()) {
diff --git a/invoices.php b/invoices.php
index ee5b0307..22cc606f 100644
--- a/invoices.php
+++ b/invoices.php
@@ -1,125 +1,125 @@
-<?php 
-  
-  include("inc_all.php");
-  
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"));
-  $sent_count = $row['num'];
+<?php
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND company_id = $session_company_id"));
-  $viewed_count = $row['num'];
+include("inc_all.php");
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND company_id = $session_company_id"));
-  $partial_count = $row['num'];
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"));
+$sent_count = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND company_id = $session_company_id"));
-  $draft_count = $row['num'];
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Viewed' AND company_id = $session_company_id"));
+$viewed_count = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id"));
-  $cancelled_count = $row['num'];
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Partial' AND company_id = $session_company_id"));
+$partial_count = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_due > CURDATE() AND company_id = $session_company_id"));
-  $overdue_count = $row['num'];
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Draft' AND company_id = $session_company_id"));
+$draft_count = $row['num'];
 
-  $sql_total_draft = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_draft FROM invoices WHERE invoice_status = 'Draft' AND company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_draft);
-  $total_draft = $row['total_draft'];
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id"));
+$cancelled_count = $row['num'];
 
-  $sql_total_sent = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_sent FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_sent);
-  $total_sent = $row['total_sent'];
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_due > CURDATE() AND company_id = $session_company_id"));
+$overdue_count = $row['num'];
 
-  $sql_total_viewed = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_viewed FROM invoices WHERE invoice_status = 'Viewed' AND company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_viewed);
-  $total_viewed = $row['total_viewed'];
+$sql_total_draft = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_draft FROM invoices WHERE invoice_status = 'Draft' AND company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_draft);
+$total_draft = $row['total_draft'];
 
-  $sql_total_cancelled = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_cancelled);
-  $total_cancelled = $row['total_cancelled'];
-  
-  $sql_total_partial = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoices.company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_partial);
-  $total_partial = $row['total_partial'];
-  $total_partial_count = mysqli_num_rows($sql_total_partial);
+$sql_total_sent = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_sent FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_sent);
+$total_sent = $row['total_sent'];
 
-  $sql_total_overdue_partial = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_overdue_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_overdue_partial);
-  $total_overdue_partial = $row['total_overdue_partial'];
+$sql_total_viewed = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_viewed FROM invoices WHERE invoice_status = 'Viewed' AND company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_viewed);
+$total_viewed = $row['total_viewed'];
 
-  $sql_total_overdue = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_overdue FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id");
-  $row = mysqli_fetch_array($sql_total_overdue);
-  $total_overdue = $row['total_overdue'];
+$sql_total_cancelled = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled' AND company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_cancelled);
+$total_cancelled = $row['total_cancelled'];
 
-  $real_overdue_amount = $total_overdue - $total_overdue_partial;
+$sql_total_partial = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoices.company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_partial);
+$total_partial = $row['total_partial'];
+$total_partial_count = mysqli_num_rows($sql_total_partial);
+
+$sql_total_overdue_partial = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_overdue_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_overdue_partial);
+$total_overdue_partial = $row['total_overdue_partial'];
+
+$sql_total_overdue = mysqli_query($mysqli,"SELECT SUM(invoice_amount) AS total_overdue FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_due < CURDATE() AND invoices.company_id = $session_company_id");
+$row = mysqli_fetch_array($sql_total_overdue);
+$total_overdue = $row['total_overdue'];
+
+$real_overdue_amount = $total_overdue - $total_overdue_partial;
 
 
-  if (!empty($_GET['sb'])) {
+if (!empty($_GET['sb'])) {
     $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
-  }else{
+} else {
     $sb = "invoice_number";
-  }
+}
 
-  // Reverse default sort
-  if (!isset($_GET['o'])) {
+// Reverse default sort
+if (!isset($_GET['o'])) {
     $o = "DESC";
     $disp = "ASC";
-  }
+}
 
-  if (empty($_GET['canned_date'])) {
+if (empty($_GET['canned_date'])) {
     //Prevents lots of undefined variable errors.
     // $dtf and $dtt will be set by the below else to 0000-00-00 / 9999-00-00
     $_GET['canned_date'] = 'custom';
-  }
+}
 
-  //Invoice status from GET
-  if (isset($_GET['status']) && ($_GET['status']) == 'Draft') {
+//Invoice status from GET
+if (isset($_GET['status']) && ($_GET['status']) == 'Draft') {
     $status_query = 'Draft';
-  }elseif (isset($_GET['status']) && ($_GET['status']) == 'Sent') {
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Sent') {
     $status_query = 'Sent';
-  }elseif (isset($_GET['status']) && ($_GET['status']) == 'Viewed') {
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Viewed') {
     $status_query = 'Viewed';
-  }elseif (isset($_GET['status']) && ($_GET['status']) == 'Partial') {
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Partial') {
     $status_query = 'Partial';
-  }else{
+} else {
     $status_query = '%';
-  }
-  
-  //Date Filter
-  if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
+}
+
+//Date Filter
+if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
     $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
     $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
-  }elseif ($_GET['canned_date'] == "today") {
+} elseif ($_GET['canned_date'] == "today") {
     $dtf = date('Y-m-d');
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "yesterday") {
+} elseif ($_GET['canned_date'] == "yesterday") {
     $dtf = date('Y-m-d',strtotime("yesterday"));
     $dtt = date('Y-m-d',strtotime("yesterday"));
-  }elseif ($_GET['canned_date'] == "thisweek") {
+} elseif ($_GET['canned_date'] == "thisweek") {
     $dtf = date('Y-m-d',strtotime("monday this week"));
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "lastweek") {
+} elseif ($_GET['canned_date'] == "lastweek") {
     $dtf = date('Y-m-d',strtotime("monday last week"));
     $dtt = date('Y-m-d',strtotime("sunday last week"));
-  }elseif ($_GET['canned_date'] == "thismonth") {
+} elseif ($_GET['canned_date'] == "thismonth") {
     $dtf = date('Y-m-01');
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "lastmonth") {
+} elseif ($_GET['canned_date'] == "lastmonth") {
     $dtf = date('Y-m-d',strtotime("first day of last month"));
     $dtt = date('Y-m-d',strtotime("last day of last month"));
-  }elseif ($_GET['canned_date'] == "thisyear") {
+} elseif ($_GET['canned_date'] == "thisyear") {
     $dtf = date('Y-01-01');
     $dtt = date('Y-m-d');
-  }elseif ($_GET['canned_date'] == "lastyear") {
+} elseif ($_GET['canned_date'] == "lastyear") {
     $dtf = date('Y-m-d',strtotime("first day of january last year"));
-    $dtt = date('Y-m-d',strtotime("last day of december last year"));  
-  }else{
+    $dtt = date('Y-m-d',strtotime("last day of december last year"));
+} else {
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
-  }
-  
-  //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 invoices
+//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 invoices
     LEFT JOIN clients ON invoice_client_id = client_id
     LEFT JOIN categories ON invoice_category_id = category_id
     WHERE invoices.company_id = $session_company_id
@@ -128,247 +128,247 @@
     AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%' OR category_name LIKE '%$q%') 
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
 <div class="row">
-  <div class="col-lg-3">
-    <!-- small box -->
-    <a href="?<?php echo $url_query_strings_sb; ?>&status=Draft" class="small-box bg-secondary">
-      <div class="inner">
-        <h3><?php echo numfmt_format_currency($currency_format, $total_draft, $session_company_currency); ?></h3>
-        <p><?php echo $draft_count; ?> Draft</p>
-      </div>
-      <div class="icon">
-        <i class="fa fa-pencil-ruler"></i>
-      </div>
-    </a>
-  </div>
-  <!-- ./col -->
+    <div class="col-lg-3">
+        <!-- small box -->
+        <a href="?<?php echo $url_query_strings_sb; ?>&status=Draft" class="small-box bg-secondary">
+            <div class="inner">
+                <h3><?php echo numfmt_format_currency($currency_format, $total_draft, $session_company_currency); ?></h3>
+                <p><?php echo $draft_count; ?> Draft</p>
+            </div>
+            <div class="icon">
+                <i class="fa fa-pencil-ruler"></i>
+            </div>
+        </a>
+    </div>
+    <!-- ./col -->
 
-  <div class="col-lg-3">
-    <!-- small box -->
-    <a href="?<?php echo $url_query_strings_sb; ?>&status=Sent" class="small-box bg-warning">
-      <div class="inner text-white">
-        <h3><?php echo numfmt_format_currency($currency_format, $total_sent, $session_company_currency); ?></h3>
-        <p><?php echo $sent_count; ?> Sent</p>
-      </div>
-      <div class="icon">
-        <i class="fa fa-paper-plane"></i>
-      </div>
-    </a>
-  </div>
-  <!-- ./col -->
+    <div class="col-lg-3">
+        <!-- small box -->
+        <a href="?<?php echo $url_query_strings_sb; ?>&status=Sent" class="small-box bg-warning">
+            <div class="inner text-white">
+                <h3><?php echo numfmt_format_currency($currency_format, $total_sent, $session_company_currency); ?></h3>
+                <p><?php echo $sent_count; ?> Sent</p>
+            </div>
+            <div class="icon">
+                <i class="fa fa-paper-plane"></i>
+            </div>
+        </a>
+    </div>
+    <!-- ./col -->
 
-  <div class="col-lg-3">
-    <!-- small box -->
-    <a href="?<?php echo $url_query_strings_sb; ?>&status=Viewed" class="small-box bg-info">
-      <div class="inner">
-        <h3><?php echo numfmt_format_currency($currency_format, $total_viewed, $session_company_currency); ?></h3>
-        <p><?php echo $viewed_count; ?> Viewed</p>
-      </div>
-      <div class="icon">
-        <i class="fa fa-eye"></i>
-      </div>
-    </a>
-  </div>
-  <!-- ./col -->
+    <div class="col-lg-3">
+        <!-- small box -->
+        <a href="?<?php echo $url_query_strings_sb; ?>&status=Viewed" class="small-box bg-info">
+            <div class="inner">
+                <h3><?php echo numfmt_format_currency($currency_format, $total_viewed, $session_company_currency); ?></h3>
+                <p><?php echo $viewed_count; ?> Viewed</p>
+            </div>
+            <div class="icon">
+                <i class="fa fa-eye"></i>
+            </div>
+        </a>
+    </div>
+    <!-- ./col -->
 
-  <div class="col-lg-3">
-    <!-- small box -->
-    <a href="?<?php echo $url_query_strings_sb; ?>&status=Partial" class="small-box bg-primary">
-      <div class="inner">
-        <h3><?php echo numfmt_format_currency($currency_format, $total_partial, $session_company_currency); ?></h3>
-        <p><?php echo $partial_count; ?> Partial</p>
-      </div>
-      <div class="icon">
-        <i class="fa fa-wine-glass-alt"></i>
-      </div>
-    </a>
-  </div>
-  <!-- ./col -->
+    <div class="col-lg-3">
+        <!-- small box -->
+        <a href="?<?php echo $url_query_strings_sb; ?>&status=Partial" class="small-box bg-primary">
+            <div class="inner">
+                <h3><?php echo numfmt_format_currency($currency_format, $total_partial, $session_company_currency); ?></h3>
+                <p><?php echo $partial_count; ?> Partial</p>
+            </div>
+            <div class="icon">
+                <i class="fa fa-wine-glass-alt"></i>
+            </div>
+        </a>
+    </div>
+    <!-- ./col -->
 
 </div>
 
 <div class="card card-dark">
-  <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Invoices</h3>
-    <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-fw fa-plus"></i> New Invoice</button>
-    </div>
-  </div>
-
-  <div class="card-body">
-    <form class="mb-4" autocomplete="off">
-      <input type="hidden" name="status" value="<?php if (isset($_GET['status'])) { echo htmlentities($_GET['status']); } ?>">
-      <div class="row">
-        <div class="col-sm-4">
-          <div class="input-group">
-            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Invoices">
-            <div class="input-group-append">
-              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-            </div>
-          </div>
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Invoices</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-fw fa-plus"></i> New Invoice</button>
         </div>
-      </div>
-      <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
-        <div class="row">
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Canned Date</label>
-              <select class="form-control select2" name="canned_date">
-                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
-                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
-                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
-                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
-                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
-                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
-                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
-                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
-                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
-              </select>
+    </div>
+
+    <div class="card-body">
+        <form class="mb-4" autocomplete="off">
+            <input type="hidden" name="status" value="<?php if (isset($_GET['status'])) { echo htmlentities($_GET['status']); } ?>">
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class="input-group">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) {echo strip_tags(htmlentities($q));} ?>" placeholder="Search Invoices">
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+                            <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo $dtf; ?>">
+            <div class="collapse mt-3 <?php if (!empty($_GET['dtf'])) { echo "show"; } ?>" id="advancedFilter">
+                <div class="row">
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label>Canned Date</label>
+                            <select class="form-control select2" name="canned_date">
+                                <option <?php if ($_GET['canned_date'] == "custom") { echo "selected"; } ?> value="custom">Custom</option>
+                                <option <?php if ($_GET['canned_date'] == "today") { echo "selected"; } ?> value="today">Today</option>
+                                <option <?php if ($_GET['canned_date'] == "yesterday") { echo "selected"; } ?> value="yesterday">Yesterday</option>
+                                <option <?php if ($_GET['canned_date'] == "thisweek") { echo "selected"; } ?> value="thisweek">This Week</option>
+                                <option <?php if ($_GET['canned_date'] == "lastweek") { echo "selected"; } ?> value="lastweek">Last Week</option>
+                                <option <?php if ($_GET['canned_date'] == "thismonth") { echo "selected"; } ?> value="thismonth">This Month</option>
+                                <option <?php if ($_GET['canned_date'] == "lastmonth") { echo "selected"; } ?> value="lastmonth">Last Month</option>
+                                <option <?php if ($_GET['canned_date'] == "thisyear") { echo "selected"; } ?> value="thisyear">This Year</option>
+                                <option <?php if ($_GET['canned_date'] == "lastyear") { echo "selected"; } ?> value="lastyear">Last Year</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label>Date From</label>
+                            <input type="date" class="form-control" name="dtf" max="2999-12-31" value="<?php echo $dtf; ?>">
+                        </div>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-group">
+                            <label>Date To</label>
+                            <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo $dtt; ?>">
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-          <div class="col-md-2">
-            <div class="form-group">
-              <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo $dtt; ?>">
-            </div>
-          </div>
-        </div>    
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Number</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_scope&o=<?php echo $disp; ?>">Scope</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
-            <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_amount&o=<?php echo $disp; ?>">Amount</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_date&o=<?php echo $disp; ?>">Date</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_due&o=<?php echo $disp; ?>">Due</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_status&o=<?php echo $disp; ?>">Status</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while ($row = mysqli_fetch_array($sql)) {
-            $invoice_id = $row['invoice_id'];
-            $invoice_prefix = htmlentities($row['invoice_prefix']);
-            $invoice_number = htmlentities($row['invoice_number']);
-            $invoice_scope = htmlentities($row['invoice_scope']);
-            if (empty($invoice_scope)) {
-              $invoice_scope_display = "-";
-            }else{
-              $invoice_scope_display = $invoice_scope;
-            }
-            $invoice_status = htmlentities($row['invoice_status']);
-            $invoice_date = $row['invoice_date'];
-            $invoice_due = $row['invoice_due'];
-            $invoice_amount = floatval($row['invoice_amount']);
-            $invoice_currency_code = htmlentities($row['invoice_currency_code']);
-            $invoice_created_at = $row['invoice_created_at'];
-            $client_id = $row['client_id'];
-            $client_name = htmlentities($row['client_name']);
-            $category_id = $row['category_id'];
-            $category_name = htmlentities($row['category_name']);
-            $client_currency_code = htmlentities($row['client_currency_code']);
-            $client_net_terms = htmlentities($row['client_net_terms']);
-            if ($client_net_terms == 0) {
-              $client_net_terms = $config_default_net_terms;
-            }
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Number</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_scope&o=<?php echo $disp; ?>">Scope</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
+                    <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_amount&o=<?php echo $disp; ?>">Amount</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_date&o=<?php echo $disp; ?>">Date</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_due&o=<?php echo $disp; ?>">Due</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
+                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_status&o=<?php echo $disp; ?>">Status</a></th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
 
-            $now = time();
+                while ($row = mysqli_fetch_array($sql)) {
+                    $invoice_id = $row['invoice_id'];
+                    $invoice_prefix = htmlentities($row['invoice_prefix']);
+                    $invoice_number = htmlentities($row['invoice_number']);
+                    $invoice_scope = htmlentities($row['invoice_scope']);
+                    if (empty($invoice_scope)) {
+                        $invoice_scope_display = "-";
+                    } else {
+                        $invoice_scope_display = $invoice_scope;
+                    }
+                    $invoice_status = htmlentities($row['invoice_status']);
+                    $invoice_date = $row['invoice_date'];
+                    $invoice_due = $row['invoice_due'];
+                    $invoice_amount = floatval($row['invoice_amount']);
+                    $invoice_currency_code = htmlentities($row['invoice_currency_code']);
+                    $invoice_created_at = $row['invoice_created_at'];
+                    $client_id = $row['client_id'];
+                    $client_name = htmlentities($row['client_name']);
+                    $category_id = $row['category_id'];
+                    $category_name = htmlentities($row['category_name']);
+                    $client_currency_code = htmlentities($row['client_currency_code']);
+                    $client_net_terms = htmlentities($row['client_net_terms']);
+                    if ($client_net_terms == 0) {
+                        $client_net_terms = $config_default_net_terms;
+                    }
 
-            if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now ) {
-              $overdue_color = "text-danger font-weight-bold";
-            }else{
-              $overdue_color = "";
-            }
+                    $now = time();
 
-            if ($invoice_status == "Sent") {
-              $invoice_badge_color = "warning text-white";
-            }elseif ($invoice_status == "Viewed") {
-              $invoice_badge_color = "info";
-            }elseif ($invoice_status == "Partial") {
-              $invoice_badge_color = "primary";
-            }elseif ($invoice_status == "Paid") {
-              $invoice_badge_color = "success";
-            }elseif ($invoice_status == "Cancelled") {
-              $invoice_badge_color = "danger";
-            }else{
-              $invoice_badge_color = "secondary";
-            }
+                    if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now ) {
+                        $overdue_color = "text-danger font-weight-bold";
+                    } else {
+                        $overdue_color = "";
+                    }
 
-          ?>
+                    if ($invoice_status == "Sent") {
+                        $invoice_badge_color = "warning text-white";
+                    } elseif ($invoice_status == "Viewed") {
+                        $invoice_badge_color = "info";
+                    } elseif ($invoice_status == "Partial") {
+                        $invoice_badge_color = "primary";
+                    } elseif ($invoice_status == "Paid") {
+                        $invoice_badge_color = "success";
+                    } elseif ($invoice_status == "Cancelled") {
+                        $invoice_badge_color = "danger";
+                    } else{
+                        $invoice_badge_color = "secondary";
+                    }
 
-          <tr>
-            <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
-            <td><?php echo $invoice_scope_display; ?></td>
-            <td><a href="client_invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
-            <td><?php echo $invoice_date; ?></td>
-            <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
-            <td><?php echo $category_name; ?></td>
-            <td>
+                    ?>
+
+                    <tr>
+                        <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
+                        <td><?php echo $invoice_scope_display; ?></td>
+                        <td><a href="client_invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                        <td><?php echo $invoice_date; ?></td>
+                        <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
+                        <td><?php echo $category_name; ?></td>
+                        <td>
               <span class="p-2 badge badge-<?php echo $invoice_badge_color; ?>">
                 <?php echo $invoice_status; ?>
               </span>
-            </td>
-            <td>
-              <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
-                  <div class="dropdown-divider"></div>
-                  <?php if (!empty($config_smtp_host)) { ?>
-                  <a class="dropdown-item" href="post.php?email_invoice=<?php echo $invoice_id; ?>">Send</a>
-                  <div class="dropdown-divider"></div>
-                  <?php } ?>
-                  <a class="dropdown-item text-danger" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
-                </div>
-              </div>
-            </td>
-          </tr>
+                        </td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">Edit</a>
+                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
+                                    <div class="dropdown-divider"></div>
+                                    <?php if (!empty($config_smtp_host)) { ?>
+                                        <a class="dropdown-item" href="post.php?email_invoice=<?php echo $invoice_id; ?>">Send</a>
+                                        <div class="dropdown-divider"></div>
+                                    <?php } ?>
+                                    <a class="dropdown-item text-danger" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
 
-          <?php
+                    <?php
 
-            
-            include("invoice_edit_modal.php");
-            include("invoice_copy_modal.php");
-          
-          }
 
-          ?>
+                    include("invoice_edit_modal.php");
+                    include("invoice_copy_modal.php");
 
-        </tbody>
-      </table>
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php include("pagination.php"); ?>
     </div>
-    <?php include("pagination.php"); ?>
-  </div>
 </div>
 
-<?php 
-  
-  include("invoice_add_modal.php");
-  include("category_quick_add_modal.php");
+<?php
 
-  include("footer.php");
+include("invoice_add_modal.php");
+include("category_quick_add_modal.php");
 
-?>
\ No newline at end of file
+include("footer.php");
+
+?>
diff --git a/portal/check_login.php b/portal/check_login.php
index d09b9e83..7995dbd9 100644
--- a/portal/check_login.php
+++ b/portal/check_login.php
@@ -20,17 +20,28 @@ if (!$_SESSION['client_logged_in']) {
     die;
 }
 
-// SESSION FINGERPRINT
+// User IP & UA
 $session_ip = strip_tags(mysqli_real_escape_string($mysqli, getIP()));
-
-// Get user agent
 $session_user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT']));
 
+
 // Get info from session
 $session_client_id = $_SESSION['client_id'];
 $session_contact_id = $_SESSION['contact_id'];
 $session_company_id = $_SESSION['company_id'];
 
+
+// Get company info from database
+$sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = $session_company_id");
+$row = mysqli_fetch_array($sql);
+
+$session_company_name = $row['company_name'];
+$session_company_country = $row['company_country'];
+$session_company_locale = $row['company_locale'];
+$session_company_currency = $row['company_currency'];
+$currency_format = numfmt_create($session_company_locale, NumberFormatter::CURRENCY);
+
+
 // Get contact info
 $contact_sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_id = '$session_contact_id' AND contact_client_id = '$session_client_id'");
 $contact = mysqli_fetch_array($contact_sql);
@@ -41,6 +52,17 @@ $session_contact_title = strip_tags(mysqli_real_escape_string($mysqli, $contact[
 $session_contact_email = strip_tags(mysqli_real_escape_string($mysqli, $contact['contact_email']));
 $session_contact_photo = $contact['contact_photo'];
 
+$session_contact_is_technical_contact = false;
+$session_contact_is_billing_contact = false;
+if ($contact['contact_technical'] == 1) {
+    $session_contact_is_technical_contact = true;
+}
+if ($contact['contact_billing'] == 1) {
+    $session_contact_is_billing_contact = true;
+}
+
+
+
 // Get client info
 $client_sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = '$session_client_id'");
 $client = mysqli_fetch_array($client_sql);
diff --git a/portal/invoices.php b/portal/invoices.php
index 3ceabcea..8ca7bbf6 100644
--- a/portal/invoices.php
+++ b/portal/invoices.php
@@ -4,21 +4,14 @@
  * Invoices for PTC
  */
 
-/*
-TODO:
-    - Allow accounting contacts to see this page
-    - Tidy styling and add currency codes
-    - Add links to see the invoice in full (similar to invoice guest view)
-*/
-
 require_once("inc_portal.php");
 
-if ($session_contact_id !== $session_client_primary_contact_id) {
+if ($session_contact_id !== $session_client_primary_contact_id && !$session_contact_is_billing_contact) {
     header("Location: portal_post.php?logout");
     exit();
 }
 
-$invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_client_id = $session_client_id AND invoice_status = 'Paid' ORDER BY invoice_date DESC");
+$invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_client_id = $session_client_id AND (invoice_status = 'Sent' OR invoice_status = 'Viewed' OR invoice_status = 'Paid') ORDER BY invoice_date DESC");
 ?>
 
     <div class="row">
@@ -53,8 +46,10 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
                 <tr>
                     <th>#</th>
                     <th>Scope</th>
-                    <th>Date</th>
                     <th>Amount</th>
+                    <th>Date</th>
+                    <th>Due</th>
+                    <th>Status</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -65,15 +60,52 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
                     $invoice_prefix = htmlentities($row['invoice_prefix']);
                     $invoice_number = htmlentities($row['invoice_number']);
                     $invoice_scope = htmlentities($row['invoice_scope']);
+                    $invoice_status = htmlentities($row['invoice_status']);
                     $invoice_date = $row['invoice_date'];
+                    $invoice_due = $row['invoice_due'];
                     $invoice_amount = floatval($row['invoice_amount']);
+                    $invoice_url_key = htmlentities($row['invoice_url_key']);
+
+                    if (empty($invoice_scope)) {
+                        $invoice_scope_display = "-";
+                    } else {
+                        $invoice_scope_display = $invoice_scope;
+                    }
+
+                    $now = time();
+                    if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now ) {
+                        $overdue_color = "text-danger font-weight-bold";
+                    } else {
+                        $overdue_color = "";
+                    }
+
+                    if ($invoice_status == "Sent") {
+                        $invoice_badge_color = "warning text-white";
+                    } elseif ($invoice_status == "Viewed") {
+                        $invoice_badge_color = "info";
+                    } elseif ($invoice_status == "Partial") {
+                        $invoice_badge_color = "primary";
+                    } elseif ($invoice_status == "Paid") {
+                        $invoice_badge_color = "success";
+                    } elseif ($invoice_status == "Cancelled") {
+                        $invoice_badge_color = "danger";
+                    } else{
+                        $invoice_badge_color = "secondary";
+                    }
                     ?>
 
                     <tr>
-                        <td><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
-                        <td><?php echo $invoice_scope; ?></td>
+                        <td><a target="_blank" href="\\<?php echo $config_base_url ?>/guest_view_invoice.php?invoice_id=<?php echo "$invoice_id&url_key=$invoice_url_key"?>"> <?php echo "$invoice_prefix$invoice_number"; ?></a></td>
+                        <td><?php echo $invoice_scope_display; ?></td>
+                        <td><?php echo numfmt_format_currency($currency_format, $invoice_amount, $session_company_currency); ?></td>
                         <td><?php echo $invoice_date; ?></td>
-                        <td><?php echo $invoice_amount; ?></td>
+                        <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
+                        <td>
+                            <span class="p-2 badge badge-<?php echo $invoice_badge_color; ?>">
+                                <?php echo $invoice_status; ?>
+                            </span>
+                        </td>
+
                     </tr>
                     <?php
                 }
diff --git a/portal/portal_functions.php b/portal/portal_functions.php
index f4b8cca4..e703df75 100644
--- a/portal/portal_functions.php
+++ b/portal/portal_functions.php
@@ -7,17 +7,17 @@
 /*
  * Verifies a contact has access to a particular ticket ID, and that the ticket is in the correct state (open/closed) to perform an action
  */
-function verifyContactTicketAccess($requested_ticket_id, $expected_ticket_state) {
+function verifyContactTicketAccess($requested_ticket_id, $expected_ticket_state)
+{
 
     // Access the global variables
-    global $mysqli, $session_contact_id, $session_client_primary_contact_id, $session_client_id;
+    global $mysqli, $session_contact_id, $session_client_primary_contact_id, $session_contact_is_technical_contact, $session_client_id;
 
     // Setup
     if ($expected_ticket_state == "Closed") {
         // Closed tickets
         $ticket_state_snippet = "ticket_status = 'Closed'";
-    }
-    else {
+    } else {
         // Open (working/hold) tickets
         $ticket_state_snippet = "ticket_status != 'Closed'";
     }
@@ -27,12 +27,12 @@ function verifyContactTicketAccess($requested_ticket_id, $expected_ticket_state)
     $row = mysqli_fetch_array($sql);
     $ticket_id = $row['ticket_id'];
 
-    if (intval($ticket_id) && ($session_contact_id == $row['ticket_contact_id'] || $session_contact_id == $session_client_primary_contact_id)) {
-        // Client is ticket owner, or primary contact
-        return TRUE;
+    if (intval($ticket_id) && ($session_contact_id == $row['ticket_contact_id'] || $session_contact_id == $session_client_primary_contact_id || $session_contact_is_technical_contact)) {
+        // Client is ticket owner, primary contact, or a technical contact
+        return true;
     }
 
-    // Client is NOT ticket owner or primary contact
-    return FALSE;
+    // Client is NOT ticket owner or primary/tech contact
+    return false;
 
-}
\ No newline at end of file
+}
diff --git a/portal/portal_header.php b/portal/portal_header.php
index 59c40342..ecc88dc2 100644
--- a/portal/portal_header.php
+++ b/portal/portal_header.php
@@ -43,7 +43,7 @@
                     <li class="nav-item">
                         <a class="nav-link <?php if (basename($_SERVER['PHP_SELF']) == "tickets.php" || basename($_SERVER['PHP_SELF']) == "ticket_add.php" || basename($_SERVER['PHP_SELF']) == "ticket.php") {echo "active";} ?>" href="tickets.php">Tickets</a>
                     </li>
-                <?php if ($session_contact_id == $session_client_primary_contact_id) { ?>
+                <?php if ($session_contact_id == $session_client_primary_contact_id || $session_contact_is_billing_contact) { ?>
                     <li class="nav-item">
                         <a class="nav-link <?php if (basename($_SERVER['PHP_SELF']) == "invoices.php") {echo "active";} ?>" href="invoices.php">Invoices</a>
                     </li>
diff --git a/portal/profile.php b/portal/profile.php
index 7f8b76e0..26ff7058 100644
--- a/portal/profile.php
+++ b/portal/profile.php
@@ -4,16 +4,21 @@
  * User profile
  */
 
-require('inc_portal.php');
+require_once('inc_portal.php');
 ?>
 
-<h2>Profile</h2>
+    <h2>Profile</h2>
 
-<p>Name: <?php echo $session_contact_name ?></p>
-<p>Email: <?php echo $session_contact_email ?></p>
-<p>Client: <?php echo $session_client_name ?></p>
-<p>Client Primary Contact: <?php if ($session_client_primary_contact_id == $session_contact_id) {echo "Yes"; } else {echo "No";} ?></p>
-<p>Login via: <?php echo $_SESSION['login_method'] ?> </p>
+    <p>Name: <?php echo $session_contact_name ?></p>
+    <p>Email: <?php echo $session_contact_email ?></p>
+    <p>Client: <?php echo $session_client_name ?></p>
+    <br>
+    <p>Client Primary Contact: <?php if ($session_client_primary_contact_id == $session_contact_id) {echo "Yes"; } else {echo "No";} ?></p>
+    <p>Client Technical Contact: <?php if ($session_contact_is_technical_contact) {echo "Yes"; } else {echo "No";} ?></p>
+    <p>Client Billing Contact: <?php if ($session_contact_is_billing_contact == $session_contact_id) {echo "Yes"; } else {echo "No";} ?></p>
+
+
+    <p>Login via: <?php echo $_SESSION['login_method'] ?> </p>
 
 
     <!--  // Show option to change password if auth provider is local -->
@@ -34,8 +39,7 @@ require('inc_portal.php');
             <button type="submit" name="edit_profile" class="btn btn-primary mt-3"><i class="fa fa-fw fa-check"></i> Save password</button>
         </form>
     </div>
-
 <?php endif ?>
 
 <?php
-require_once('portal_footer.php');
\ No newline at end of file
+require_once('portal_footer.php');
diff --git a/portal/ticket.php b/portal/ticket.php
index e1fa6634..88d5ba29 100644
--- a/portal/ticket.php
+++ b/portal/ticket.php
@@ -9,7 +9,7 @@ require_once("inc_portal.php");
 if (isset($_GET['id']) && intval($_GET['id'])) {
     $ticket_id = intval($_GET['id']);
 
-    if ($session_contact_id == $session_client_primary_contact_id) {
+    if ($session_contact_id == $session_client_primary_contact_id || $session_contact_is_technical_contact) {
         $ticket_sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = '$ticket_id' AND ticket_client_id = '$session_client_id'");
     } else {
         $ticket_sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = '$ticket_id' AND ticket_client_id = '$session_client_id' AND ticket_contact_id = '$session_contact_id'");
@@ -42,14 +42,11 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
         <div class="card">
             <div class="card-header bg-dark text-center">
                 <h4 class="mt-1">
-                    Ticket <?php echo $ticket_prefix, $ticket_number ?> 
+                    Ticket <?php echo $ticket_prefix, $ticket_number ?>
                     <?php
-                    if ($ticket_status !== "Closed") {
-                    ?>
-                    <a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-sm btn-outline-success float-right text-white"><i class="fas fa-fw fa-check text-success"></i> Close ticket</a>
-                    <?php
-                    }
-                    ?>
+                    if ($ticket_status !== "Closed") { ?>
+                        <a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-sm btn-outline-success float-right text-white"><i class="fas fa-fw fa-check text-success"></i> Close ticket</a>
+                    <?php } ?>
                 </h4>
             </div>
 
@@ -61,7 +58,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                     <br>
                     <strong>Priority:</strong> <?php echo $ticket_priority ?>
                 </p>
-                <strong>Issue:</strong> <?php echo $ticket_details ?>
+                <?php echo $ticket_details ?>
             </div>
         </div>
 
@@ -69,7 +66,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
         <!-- Either show the reply comments box, ticket smiley feedback, or thanks for feedback -->
 
         <?php if ($ticket_status !== "Closed") { ?>
-           
+
             <form action="portal_post.php" method="post">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id ?>">
                 <div class="form-group">
@@ -77,7 +74,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                 </div>
                 <button type="submit" class="btn btn-primary" name="add_ticket_comment">Save reply</button>
             </form>
-           
+
         <?php }
 
         elseif (empty($ticket_feedback)) { ?>
@@ -138,18 +135,18 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                 <div class="card-header">
                     <h3 class="card-title">
                         <div class="media">
-                            <?php 
-                            if (!empty($user_avatar)) { 
-                            ?>
+                            <?php
+                            if (!empty($user_avatar)) {
+                                ?>
                                 <img src="<?php echo $avatar_link ?>" alt="User Avatar" class="img-size-50 mr-3 img-circle">
-                            <?php 
-                            } else { 
-                            ?>
+                                <?php
+                            } else {
+                                ?>
                                 <span class="fa-stack fa-2x">
                                     <i class="fa fa-circle fa-stack-2x text-secondary"></i>
                                     <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
                                 </span>
-                            <?php
+                                <?php
                             }
                             ?>
 
diff --git a/portal/ticket_add.php b/portal/ticket_add.php
index 31fc6b94..d788f723 100644
--- a/portal/ticket_add.php
+++ b/portal/ticket_add.php
@@ -4,57 +4,57 @@
  * New ticket form
  */
 
-require('inc_portal.php');
+require_once('inc_portal.php');
 ?>
 
-<ol class="breadcrumb d-print-none">
-    <li class="breadcrumb-item">
-        <a href="index.php">Home</a>
-    </li>
-    <li class="breadcrumb-item">
-        <a href="tickets.php">Tickets</a>
-    </li>
-    <li class="breadcrumb-item active">New Ticket</li>
-</ol>
+    <ol class="breadcrumb d-print-none">
+        <li class="breadcrumb-item">
+            <a href="index.php">Home</a>
+        </li>
+        <li class="breadcrumb-item">
+            <a href="tickets.php">Tickets</a>
+        </li>
+        <li class="breadcrumb-item active">New Ticket</li>
+    </ol>
 
-<h2>Raise a new ticket</h2>
+    <h2>Raise a new ticket</h2>
 
-<div class="col-md-8">
-    <form action="portal_post.php" method="post">
+    <div class="col-md-8">
+        <form action="portal_post.php" method="post">
 
-        <div class="form-group">
-            <label>Subject <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+            <div class="form-group">
+                <label>Subject <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="subject" placeholder="Subject" required>
                 </div>
-                <input type="text" class="form-control" name="subject" placeholder="Subject" required>
             </div>
-        </div>
 
-        <div class="form-group">
-            <label>Priority <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-                <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+            <div class="form-group">
+                <label>Priority <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                    </div>
+                    <select class="form-control select2" name="priority" required>
+                        <option>Low</option>
+                        <option>Medium</option>
+                        <option>High</option>
+                    </select>
                 </div>
-                <select class="form-control select2" name="priority" required>
-                    <option>Low</option>
-                    <option>Medium</option>
-                    <option>High</option>
-                </select>
             </div>
-        </div>
 
-        <div class="form-group">
-            <label>Details <strong class="text-danger">*</strong></label>
-            <textarea class="form-control" rows="4" name="details" required></textarea>
-        </div>
+            <div class="form-group">
+                <label>Details <strong class="text-danger">*</strong></label>
+                <textarea class="form-control" rows="4" name="details" required></textarea>
+            </div>
 
-        <button class="btn btn-primary" name="add_ticket">Raise ticket</button>
+            <button class="btn btn-primary" name="add_ticket">Raise ticket</button>
 
-    </form>
-</div>
+        </form>
+    </div>
 
 <?php
 require_once('portal_footer.php');
diff --git a/portal/ticket_view_all.php b/portal/ticket_view_all.php
index a9979460..063c284a 100644
--- a/portal/ticket_view_all.php
+++ b/portal/ticket_view_all.php
@@ -6,7 +6,7 @@
 
 require_once('inc_portal.php');
 
-if ($session_contact_id !== $session_client_primary_contact_id) {
+if ($session_contact_id !== $session_client_primary_contact_id && !$session_contact_is_technical_contact) {
     header("Location: portal_post.php?logout");
     exit();
 }
diff --git a/portal/tickets.php b/portal/tickets.php
index 7a0df97b..9dfcab38 100644
--- a/portal/tickets.php
+++ b/portal/tickets.php
@@ -34,7 +34,7 @@ $sql_total_tickets_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS tota
 $row = mysqli_fetch_array($sql_total_tickets_open);
 $total_tickets_open = $row['total_tickets_open'];
 
-//Get Total tickets 
+//Get Total tickets
 $sql_total_tickets = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets FROM tickets WHERE  ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
 $row = mysqli_fetch_array($sql_total_tickets);
 $total_tickets = $row['total_tickets'];
@@ -68,7 +68,7 @@ $total_tickets = $row['total_tickets'];
 <div class="row">
 
     <div class="col-md-10">
-        
+
         <table class="table tabled-bordered border border-dark">
             <thead class="thead-dark">
                 <tr>
@@ -92,17 +92,17 @@ $total_tickets = $row['total_tickets'];
                     <td>
                         <a href="ticket.php?id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a>
                     </td>
-                    <td> 
+                    <td>
                         <a href="ticket.php?id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
                     </td>
-                    <td><?php echo $ticket_status; ?></td> 
+                    <td><?php echo $ticket_status; ?></td>
                 </tr>
             <?php
             }
             ?>
             </tbody>
         </table>
-        
+
     </div>
 
     <div class="col-md-2">
@@ -117,11 +117,11 @@ $total_tickets = $row['total_tickets'];
 
         <a href="?status=%" class="btn btn-secondary btn-block p-3 mb-3 text-left">All my tickets | <strong><?php echo $total_tickets ?></strong></a>
         <?php
-        if ($session_contact_id == $session_client_primary_contact_id) {
+        if ($session_contact_id == $session_client_primary_contact_id || $session_contact_is_technical_contact) {
         ?>
-        
+
         <hr>
-        
+
         <a href="ticket_view_all.php" class="btn btn-dark btn-block p-2 mb-3">All Tickets</a>
 
         <?php
@@ -131,4 +131,4 @@ $total_tickets = $row['total_tickets'];
     </div>
 </div>
 
-<?php require_once("portal_footer.php"); ?>
\ No newline at end of file
+<?php require_once("portal_footer.php"); ?>
diff --git a/post.php b/post.php
index d7c283a6..2d0c3eeb 100644
--- a/post.php
+++ b/post.php
@@ -1159,11 +1159,11 @@ if(isset($_POST['send_telemetry_data'])){
 
     // Invoice Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices"));
-    $invoice_count = $row['num'];  
+    $invoice_count = $row['num'];
 
     // Revenue Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('revenue_id') AS num FROM revenues"));
-    $revenue_count = $row['num'];  
+    $revenue_count = $row['num'];
 
     // Recurring Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring"));
@@ -1184,7 +1184,7 @@ if(isset($_POST['send_telemetry_data'])){
     // Payment Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('payment_id') AS num FROM payments WHERE payment_invoice_id > 0"));
     $payment_count = $row['num'];
-    
+
     // Company Vendor Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id = 0"));
     $company_vendor_count = $row['num'];
@@ -1259,7 +1259,7 @@ if(isset($_POST['send_telemetry_data'])){
 
     // Document Template Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
-    $document_template_count = $row['num'];       
+    $document_template_count = $row['num'];
 
     // Shared Item Count
     $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('item_id') AS num FROM shared_items"));
@@ -1586,11 +1586,11 @@ if(isset($_GET['update'])){
 
         // Invoice Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices"));
-        $invoice_count = $row['num'];  
+        $invoice_count = $row['num'];
 
         // Revenue Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('revenue_id') AS num FROM revenues"));
-        $revenue_count = $row['num'];  
+        $revenue_count = $row['num'];
 
         // Recurring Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring"));
@@ -1611,7 +1611,7 @@ if(isset($_GET['update'])){
         // Payment Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('payment_id') AS num FROM payments WHERE payment_invoice_id > 0"));
         $payment_count = $row['num'];
-        
+
         // Company Vendor Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id = 0"));
         $company_vendor_count = $row['num'];
@@ -1686,7 +1686,7 @@ if(isset($_GET['update'])){
 
         // Document Template Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
-        $document_template_count = $row['num'];       
+        $document_template_count = $row['num'];
 
         // Shared Item Count
         $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('item_id') AS num FROM shared_items"));
@@ -2343,7 +2343,7 @@ if(isset($_POST['edit_vendor_template'])){
         $sql_update_vendors = "";
     }
 
-    //Update the exisiting template and all templates bassed of this vendor template 
+    //Update the exisiting template and all templates bassed of this vendor template
     mysqli_query($mysqli,"UPDATE vendors SET vendor_name = '$name', vendor_description = '$description', vendor_contact_name = '$contact_name', vendor_phone = '$phone', vendor_extension = '$extension', vendor_email = '$email', vendor_website = '$website', vendor_hours = '$hours', vendor_sla = '$sla', vendor_code = '$code',vendor_account_number = '$account_number', vendor_notes = '$notes' WHERE (vendor_id = $vendor_id $sql_update_vendors) AND company_id = $session_company_id");
 
     //Logging
@@ -2477,7 +2477,7 @@ if(isset($_GET['delete_vendor'])){
     $vendor_name = strip_tags(mysqli_real_escape_string($mysqli, $row['vendor_name']));
     $client_id = intval($row['vendor_client_id']);
     $vendor_template_id = intval($row['vendor_template_id']);
-    
+
     // If its a template reset all vendors based off this template to no template base
     if ($vendor_template_id > 0){
         mysqli_query($mysqli,"UPDATE vendors SET vendor_template_id = 0 WHERE vendor_template_id = $vendor_template_id");
@@ -4597,14 +4597,14 @@ if(isset($_POST['edit_contact'])){
     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_important = $contact_important, contact_billing = $contact_billing, contact_technical = $contact_technical, contact_auth_method = '$auth_method', contact_department = '$department', contact_location_id = $location_id WHERE contact_id = $contact_id AND company_id = $session_company_id");
 
     // Update Primary contact in clients if primary contact is checked
-    if($primary_contact > 0){
+    if ($primary_contact > 0){
         mysqli_query($mysqli,"UPDATE clients SET primary_contact = $contact_id WHERE client_id = $client_id");
     }
 
     // Set password
     if(!empty($_POST['contact_password'])){
       $password_hash = mysqli_real_escape_string($mysqli,password_hash($_POST['contact_password'], PASSWORD_DEFAULT));
-      mysqli_query($mysqli, "UPDATE contacts SET contact_password_hash = '$password_hash' WHERE contact_client_id = '$client_id'");
+      mysqli_query($mysqli, "UPDATE contacts SET contact_password_hash = '$password_hash' WHERE contact_id = '$contact_id' AND contact_client_id = '$client_id'");
     }
 
     // Send contact a welcome e-mail, if specified