diff --git a/modals/asset_add_modal.php b/modals/asset_add_modal.php
index ebd6afb4..128ffb7d 100644
--- a/modals/asset_add_modal.php
+++ b/modals/asset_add_modal.php
@@ -150,7 +150,7 @@
                         </div>
 
                         <div class="tab-pane fade" id="pills-network">
-
+                            <?php if ($client_url) { ?>
                             <div class="form-group">
                                 <label>Network</label>
                                 <div class="input-group">
@@ -174,6 +174,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <?php } ?>
 
                             <div class="form-group">
                                 <label>IP Address or DHCP</label>
@@ -254,6 +255,7 @@
                                 </div>
                             </div>
 
+                            <?php if ($client_url) { ?>
                             <div class="form-group">
                                 <label>Location</label>
                                 <div class="input-group">
@@ -298,6 +300,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <?php } ?>
 
                             <div class="form-group">
                                 <label>Status</label>
@@ -318,6 +321,7 @@
 
                         <div class="tab-pane fade" id="pills-purchase">
 
+                            <?php if ($client_url) { ?>
                             <div class="form-group">
                                 <label>Vendor</label>
                                 <div class="input-group">
@@ -339,6 +343,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <?php } ?>
 
                             <?php if ($_GET['type'] !== 'virtual') { ?>
                                 <div class="form-group">
diff --git a/modals/certificate_add_modal.php b/modals/certificate_add_modal.php
index 8f3428c8..24bb2149 100644
--- a/modals/certificate_add_modal.php
+++ b/modals/certificate_add_modal.php
@@ -8,7 +8,6 @@
                 </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">
@@ -29,6 +28,33 @@
 
                         <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></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>
+                                </div>
+
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Certificate Name <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
@@ -49,8 +75,7 @@
                                 </div>
                             </div>
 
-                            
-
+                            <?php if ($client_url) { ?>
                             <div class="form-group">
                                 <label>Domain</label>
                                 <div class="input-group">
@@ -70,6 +95,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <?php } ?>
                         
                         </div>
 
diff --git a/modals/contact_add_modal.php b/modals/contact_add_modal.php
index 3cb7ed56..4e55037a 100644
--- a/modals/contact_add_modal.php
+++ b/modals/contact_add_modal.php
@@ -130,6 +130,7 @@
                                 </div>
                             </div>
 
+                            <?php if($client_url) { ?>
                             <div class="form-group">
                                 <label>Location</label>
                                 <div class="input-group">
@@ -151,6 +152,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <?php } ?>
 
                         </div>
 
diff --git a/modals/domain_add_modal.php b/modals/domain_add_modal.php
index 3fabeab2..a420f9bd 100644
--- a/modals/domain_add_modal.php
+++ b/modals/domain_add_modal.php
@@ -73,6 +73,7 @@
                                 </div>
                             </div>
 
+                            <?php if ($client_url) { ?>
                             <div class="form-group">
                                 <label>Registrar</label>
                                 <div class="input-group">
@@ -156,6 +157,7 @@
                                     </select>
                                 </div>
                             </div>
+                            <?php } ?>
 
                             <div class="form-group">
                                 <label>Expire Date</label>