diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php
index b48bf9b9..b0bc024c 100644
--- a/includes/client_overview_side_nav.php
+++ b/includes/client_overview_side_nav.php
@@ -15,8 +15,6 @@
 
             <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
 
-                <li class="nav-header">OVERVIEWS</li>
-
                 <?php  if (lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-item">
                         <a href="contacts.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "contacts.php" || basename($_SERVER["PHP_SELF"]) == "contact_details.php") { echo "active"; } ?>">
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 9b0b86ce..e99f483c 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -7,7 +7,7 @@
             <a class="nav-link" data-widget="pushmenu" data-enable-remember="TRUE" href="#"><i class="fas fa-bars"></i></a>
         </li>
         <li class="nav-item" title="Client Overview">
-            <a href="domains.php" class="nav-link">
+            <a href="contacts.php" class="nav-link">
                 <i class="fas fa-users nav-icon mr-2"></i>Client Overview
             </a>
         </li>
diff --git a/modals/asset_add_modal.php b/modals/asset_add_modal.php
index c7525fd2..0d057b3b 100644
--- a/modals/asset_add_modal.php
+++ b/modals/asset_add_modal.php
@@ -10,7 +10,6 @@
 
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
                 <div class="modal-body bg-white ui-front">
 
@@ -41,6 +40,38 @@
 
                         <div class="tab-pane fade show active" id="pills-details">
 
+                            <?php if ($client_url) { ?>
+                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                            <?php } else { ?>
+
+                                <div class="form-group">
+                                    <label>Client <strong class="text-danger">*</strong> / <span class="text-secondary">Use Primary Contact</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="client_id" required>
+                                            <option value="">- Select Client -</option>
+                                            <?php
+
+                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $client_id = intval($row['client_id']);
+                                                $client_name = nullable_htmlentities($row['client_name']); ?>
+                                                <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                        <div class="input-group-append">
+                                            <div class="input-group-text">
+                                                <input type="checkbox" name="use_primary_contact" value="1">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Name <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
diff --git a/modals/contact_add_modal.php b/modals/contact_add_modal.php
index b503ddad..45dc7098 100644
--- a/modals/contact_add_modal.php
+++ b/modals/contact_add_modal.php
@@ -8,7 +8,6 @@
                 </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">
@@ -32,6 +31,38 @@
 
                         <div class="tab-pane fade show active" id="pills-details">
 
+                            <?php if ($client_url) { ?>
+                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                            <?php } else { ?>
+
+                                <div class="form-group">
+                                    <label>Client <strong class="text-danger">*</strong> / <span class="text-secondary">Use Primary Contact</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="client_id" required>
+                                            <option value="">- Select Client -</option>
+                                            <?php
+
+                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                            while ($row = mysqli_fetch_array($sql)) {
+                                                $client_id = intval($row['client_id']);
+                                                $client_name = nullable_htmlentities($row['client_name']); ?>
+                                                <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                        <div class="input-group-append">
+                                            <div class="input-group-text">
+                                                <input type="checkbox" name="use_primary_contact" value="1">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Primary Contact</span></label>
                                 <div class="input-group">
diff --git a/modals/domain_add_modal.php b/modals/domain_add_modal.php
index 6b3cc90b..19bf3e86 100644
--- a/modals/domain_add_modal.php
+++ b/modals/domain_add_modal.php
@@ -26,26 +26,6 @@
 
                         <div class="tab-pane fade show active" id="pills-details">
 
-                            <div class="form-group">
-                                <label>Domain 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-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="example.com" maxlength="200" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
-                                </div>
-                            </div>
-
                             <?php if ($client_url) { ?>
                                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                             <?php } else { ?>
@@ -78,6 +58,26 @@
 
                             <?php } ?>
 
+                            <div class="form-group">
+                                <label>Domain 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-globe"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="name" placeholder="example.com" maxlength="200" required autofocus>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Description</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
+                                </div>
+                            </div>
+
                             <div class="form-group">
                                 <label>Registrar</label>
                                 <div class="input-group">