diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
new file mode 100644
index 00000000..15fbe2cb
--- /dev/null
+++ b/client_asset_copy_modal.php
@@ -0,0 +1,322 @@
+
+<div class="modal" id="copyAssetModal<?php echo $asset_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-<?php echo $device_icon; ?>"></i> <?php echo $asset_name; ?></h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span>&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" 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="#pillsDetailsCopy<?php echo $asset_id; ?>">Details</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pillsAssignmentCopy<?php echo $asset_id; ?>">Assignment</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pillsPurchaseCopy<?php echo $asset_id; ?>">Purchase</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pillsLoginCopy<?php echo $asset_id; ?>">Login</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pillsNotesCopy<?php echo $asset_id; ?>">Notes</a>
+            </li>
+          </ul>
+          
+          <hr>
+          
+          <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pillsDetailsCopy<?php echo $asset_id; ?>">
+          
+              <div class="form-group">
+                <label>Name <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="name" placeholder="Name the asset" value="<?php echo $asset_name; ?>" <?php if(!empty($asset_meshcentral_id)){echo "disabled";} ?> required>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Type <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-tags"></i></span>
+                  </div>
+                  <select class="form-control select2" name="type" required>
+                    <?php foreach($asset_types_array as $asset_type_select => $asset_icon_select) { ?>
+                    <option <?php if($asset_type_select == $asset_type) { echo "selected"; } ?>><?php echo $asset_type_select; ?></option>
+                    <?php } ?>
+                  </select>
+                </div>
+              </div>        
+              
+              <?php //Do not display Make Model or Serial if Virtual is selected 
+              if($asset_type !== 'virtual'){ ?>
+              <div class="form-group">
+                <label>Make </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="make" placeholder="Manufacturer" value="<?php echo $asset_make; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Model</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="model" placeholder="Model Number" value="<?php echo $asset_model; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Serial Number</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="serial" placeholder="Serial number">
+                </div>
+              </div>
+              <?php } ?>
+
+              <?php if($asset_type !== 'Phone' AND $asset_type !== 'Mobile Phone' AND $asset_type !== 'Tablet' AND $asset_type !== 'Access Point' AND $asset_type !== 'Printer' AND $asset_type !== 'Camera' AND $asset_type !== 'TV' AND $asset_type !== 'Other'){ ?>
+              <div class="form-group">
+                <label>Operating System</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fab fa-fw fa-windows"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="os" placeholder="ex Windows 10 Pro" <?php if(!empty($asset_meshcentral_id)){echo "disabled";} ?> value="<?php echo $asset_os; ?>">
+                </div>
+              </div>
+              <?php } ?>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pillsAssignmentCopy<?php echo $asset_id; ?>">
+
+              <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_client_id = $client_id ORDER BY location_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_locations)){
+                      $location_id_select = $row['location_id'];
+                      $location_name_select = $row['location_name'];
+                    ?>
+                    <option <?php if($asset_location_id == $location_id_select){ echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
+              <?php if($asset_type !== 'Firewall/Router' AND $asset_type !== 'Switch' AND $asset_type !== 'Access Point' AND $asset_type !== 'Printer' AND $asset_type !== 'Server' AND $asset_type !== 'Virtual Machine'){ ?>
+              <div class="form-group">
+                <label>Assigned To</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>
+                  <select class="form-control select2" name="contact">
+                    <option value="">- Contact -</option>
+                    <?php 
+                    
+                    $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_contacts)){
+                      $contact_id = $row['contact_id'];
+                      $contact_name = $row['contact_name'];
+                    ?>
+                    <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+              <?php } ?>
+
+              <div class="form-group">
+                <label>Network</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                  </div>
+                  <select class="form-control select2" name="network">
+                    <option value="">- Network -</option>
+                    <?php 
+                    
+                    $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE (network_archived_at > '$asset_created_at' OR network_archived_at IS NULL) AND network_client_id = $client_id ORDER BY network_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_networks)){
+                      $network_id_select = $row['network_id'];
+                      $network_name_select = $row['network_name'];
+                      $network_select = $row['network'];
+
+                    ?>
+                    <option <?php if($asset_network_id == $network_id_select){ echo "selected"; } ?> value="<?php echo $network_id_select; ?>"><?php echo $network_name_select; ?> - <?php echo $network_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>IP</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" data-mask>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>MAC Address</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" data-mask>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>MeshCentral Node ID</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sync"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="mesh_id" value="<?php echo $asset_meshcentral_id; ?>" placeholder="MeshCentral ID">
+                </div>
+              </div>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pillsPurchaseCopy<?php echo $asset_id; ?>">
+
+              <div class="form-group">
+                <label>Vendor</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>
+                  <select class="form-control select2" name="vendor">
+                    <option value="">- Vendor -</option>
+                    <?php 
+                    
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE (vendor_archived_at > '$asset_created_at' OR vendor_archived_at IS NULL) AND vendor_client_id = $client_id ORDER BY vendor_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_vendors)){
+                      $vendor_id_select = $row['vendor_id'];
+                      $vendor_name_select = $row['vendor_name'];
+                    ?>
+                    <option <?php if($asset_vendor_id == $vendor_id_select){ echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Install Date</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="install_date" value="<?php echo $asset_install_date; ?>">
+                </div>
+              </div>
+
+              <?php if($asset_type !== 'Virtual Machine'){ ?>
+              <div class="form-group">
+                <label>Purchase Date</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="purchase_date" value="<?php echo $asset_purchase_date; ?>">
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Warranty Expire</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                  </div>
+                  <input type="date" class="form-control" name="warranty_expire" value="<?php echo $asset_warranty_expire; ?>">
+                </div>
+              </div>
+              <?php } ?>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pillsLoginCopy<?php echo $asset_id; ?>">
+              
+              <div class="form-group">
+                <label>Username</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="username" placeholder="Username">
+                </div>
+              </div>
+              
+              <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-lock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="password" placeholder="Password">
+                </div>
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pillsNotesCopy<?php echo $asset_id; ?>">
+
+              <div class="form-group">
+                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes" <?php if(!empty($asset_meshcentral_id)){echo "disabled";} ?>><?php echo $asset_notes; ?></textarea>
+              </div>
+
+            </div>
+
+          </div>
+        </div>
+        <div class="modal-footer bg-white">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_asset" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/client_assets.php b/client_assets.php
index d7708b51..6a92c4e3 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -340,6 +340,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <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="#editAssetModal<?php echo $asset_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#copyAssetModal<?php echo $asset_id; ?>">Copy</a>
                   <?php if($ticket_count > 0){ ?>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#assetTicketsModal<?php echo $asset_id; ?>">Tickets (<?php echo $ticket_count; ?>)</a>
                   <?php } ?>
@@ -353,6 +354,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <?php
           
           include("client_asset_edit_modal.php");
+          include("client_asset_copy_modal.php");
           include("client_asset_tickets_modal.php");
           }
           
diff --git a/client_contacts.php b/client_contacts.php
index 7cf65359..d5de2544 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -13,8 +13,16 @@ if(isset($_GET['p'])){
   
 if(isset($_GET['q'])){
   $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+  //Phone Numbers
+  $n = preg_replace("/[^0-9]/", '',$q);
+  if(empty($n)){
+    $n = $q;
+  }
+
 }else{
   $q = "";
+  //Phone Numbers
+  $n = "";
 }
 
 if(!empty($_GET['sb'])){
@@ -43,7 +51,7 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM contacts
   LEFT JOIN locations ON location_id = contact_location_id
   LEFT JOIN departments ON contact_department_id = department_id
   WHERE contact_archived_at IS NULL 
-  AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%' OR contact_phone LIKE '%$q%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$q%' OR contact_email LIKE '%$q%' OR department_name LIKE '%$q%') 
+  AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%'  OR contact_email LIKE '%$q%' OR department_name LIKE '%$q%' OR contact_phone LIKE '%$n%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$n%')
   AND contact_client_id = $client_id ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -148,7 +156,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }else{
               $location_name_display = $location_name;
             }
-            $department_id = $row['department_id'];          
+            $department_id = $row['department_id'];
+
+            // Related Assets Query
+            //$sql_related_assets = mysqli_query($mysqli,"SELECT * FROM contact_assets LEFT JOIN assets ON assets.asset_id = contact_assets.asset_id WHERE contact_assets.contact_id = $contact_id ORDER BY assets.asset_id DESC");
+            //$asset_count = mysqli_num_rows($sql_related_assets);
+
+            // Related Logins Query
+            //$sql_related_logins = mysqli_query($mysqli,"SELECT * FROM logins WHERE login_contact_id = $contact_id AND company_id = $session_company_id ORDER BY login_id DESC");
+            //$login_count = mysqli_num_rows($sql_related_logins);
+
+            // Related Software Query
+            //$sql_related_software = mysqli_query($mysqli,"SELECT * FROM software WHERE software_contact_id = $contact_id AND company_id = $session_company_id ORDER BY software_id DESC");
+            //$software_count = mysqli_num_rows($sql_related_software);
       
           ?>
           <tr>