diff --git a/add_certificate_modal.php b/add_certificate_modal.php
index 2292710f..62b8d76a 100644
--- a/add_certificate_modal.php
+++ b/add_certificate_modal.php
@@ -19,6 +19,16 @@
               <input type="text" class="form-control" name="name" placeholder="Certificate name" required autofocus>
             </div>
           </div>
+
+          <div class="form-group">
+            <label>Domain</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="domain" placeholder="Domain name">
+            </div>
+          </div>
           
           <div class="form-group">
             <label>Issued By <strong class="text-danger">*</strong></label>
diff --git a/client_certificates.php b/client_certificates.php
index 1ae5e2c2..5a8b3bea 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -41,7 +41,7 @@ if(isset($_GET['o'])){
 }
 
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM certificates 
-  WHERE client_id = $client_id AND (certificate_name LIKE '%$q%' OR certificate_issued_by LIKE '%$q%') 
+  WHERE client_id = $client_id AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by LIKE '%$q%') 
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -72,6 +72,7 @@ $total_pages = ceil($total_found_rows / 10);
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_name&o=<?php echo $disp; ?>">Name</a></th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_domain&o=<?php echo $disp; ?>">Domain</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_issued_by&o=<?php echo $disp; ?>">Issued By</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_expire&o=<?php echo $disp; ?>">Expire</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_updated_at&o=<?php echo $disp; ?>">Updated</a></th>
@@ -84,6 +85,7 @@ $total_pages = ceil($total_found_rows / 10);
           while($row = mysqli_fetch_array($sql)){
             $certificate_id = $row['certificate_id'];
             $certificate_name = $row['certificate_name'];
+            $certificate_domain = $row['certificate_domain'];
             $certificate_issued_by = $row['certificate_issued_by'];
             $certificate_expire = $row['certificate_expire'];
             $certificate_updated_at = $row['certificate_updated_at'];
@@ -91,6 +93,7 @@ $total_pages = ceil($total_found_rows / 10);
           ?>
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editCertificateModal<?php echo $certificate_id; ?>"><?php echo $certificate_name; ?></a></td>
+            <td><?php echo $certificate_domain; ?></td>
             <td><?php echo $certificate_issued_by; ?></td>
             <td><?php echo $certificate_expire; ?></td>
             <td><?php echo $certificate_updated_at; ?></td>
diff --git a/db.sql b/db.sql
index 4cea0f85..5e45b806 100644
--- a/db.sql
+++ b/db.sql
@@ -133,6 +133,7 @@ DROP TABLE IF EXISTS `certificates`;
 CREATE TABLE `certificates` (
   `certificate_id` int(11) NOT NULL AUTO_INCREMENT,
   `certificate_name` varchar(200) NOT NULL,
+  `certificate_domain` varchar(200) DEFAULT NULL,
   `certificate_issued_by` varchar(200) NOT NULL,
   `certificate_expire` date DEFAULT NULL,
   `certificate_notes` text DEFAULT NULL,
@@ -920,4 +921,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-01-26 19:16:25
+-- Dump completed on 2021-01-27 14:21:51
diff --git a/edit_certificate_modal.php b/edit_certificate_modal.php
index 7717d5f2..48cf5014 100644
--- a/edit_certificate_modal.php
+++ b/edit_certificate_modal.php
@@ -20,6 +20,16 @@
             </div>
           </div>
 
+          <div class="form-group">
+            <label>Domain</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="domain" placeholder="Domain" value="<?php echo $certificate_domain; ?>">
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Issued By <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/post.php b/post.php
index 5c4932fc..8eccc08a 100644
--- a/post.php
+++ b/post.php
@@ -3561,13 +3561,14 @@ if(isset($_POST['add_certificate'])){
  
     $client_id = intval($_POST['client_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
+    $domain = strip_tags(mysqli_real_escape_string($mysqli,$_POST['domain']));
     $issued_by = strip_tags(mysqli_real_escape_string($mysqli,$_POST['issued_by']));
     $expire = strip_tags(mysqli_real_escape_string($mysqli,$_POST['expire']));
     if(empty($expire)){
         $expire = "0000-00-00";
     }
 
-    mysqli_query($mysqli,"INSERT INTO certificates SET certificate_name = '$name', certificate_issued_by = '$issued_by', certificate_expire = '$expire', certificate_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = '$expire', certificate_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Certificate', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
@@ -3582,13 +3583,14 @@ if(isset($_POST['edit_certificate'])){
 
     $certificate_id = intval($_POST['certificate_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
+    $domain = strip_tags(mysqli_real_escape_string($mysqli,$_POST['domain']));
     $issued_by = strip_tags(mysqli_real_escape_string($mysqli,$_POST['issued_by']));
     $expire = strip_tags(mysqli_real_escape_string($mysqli,$_POST['expire']));
     if(empty($expire)){
         $expire = "0000-00-00";
     }
 
-    mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_issued_by = '$issued_by', certificate_expire = '$expire', certificate_updated_at = NOW() WHERE certificate_id = $certificate_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = '$expire', certificate_updated_at = NOW() WHERE certificate_id = $certificate_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Certificate', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");