diff --git a/dashboard_technical.php b/dashboard_technical.php
index 78750a19..542ccf2e 100644
--- a/dashboard_technical.php
+++ b/dashboard_technical.php
@@ -3,9 +3,9 @@
 <?php
 
 if(isset($_GET['year'])){
-$year = intval($_GET['year']);
+    $year = intval($_GET['year']);
 }else{
-$year = date('Y');
+    $year = date('Y');
 }
 
 //GET unique years from expenses, payments and revenues
@@ -16,61 +16,107 @@ $sql_clients = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_id'
 $clients_added = $sql_clients['clients_added'];
 
 // Ticket count
-$sql_tickets = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS active_tickets FROM tickets WHERE ticket_status != 'Closed'"));
+$sql_tickets = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS active_tickets FROM tickets WHERE ticket_status != 'Closed' AND company_id = $session_company_id"));
 $active_tickets = $sql_tickets['active_tickets'];
 
+// Expiring domains (but not ones that have already expired)
+$sql_domains_expiring = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') as expiring_domains FROM domains
+    WHERE domain_expire != '0000-00-00'
+    AND domain_archived_at IS NULL
+    AND domain_expire > CURRENT_DATE
+    AND domain_expire < CURRENT_DATE + INTERVAL 30 DAY
+    AND company_id = $session_company_id"));
+$expiring_domains = $sql_domains_expiring['expiring_domains'];
+
+// Expiring Certificates (but not ones that have already expired)
+$sql_certs_expiring = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('certificate_id') as expiring_certs FROM certificates
+    WHERE certificate_expire != '0000-00-00'
+    AND certificate_archived_at IS NULL
+    AND certificate_expire > CURRENT_DATE
+    AND certificate_expire < CURRENT_DATE + INTERVAL 30 DAY
+    AND company_id = $session_company_id"));
+$expiring_certificates = $sql_certs_expiring['expiring_certs'];
+
 ?>
 
-<form class="mb-3">
-    <select onchange="this.form.submit()" class="form-control" name="year">
-        <?php
+    <form class="mb-3">
+        <select onchange="this.form.submit()" class="form-control" name="year">
+            <?php
 
-        while($row = mysqli_fetch_array($sql_payment_years)){
-            $payment_year = $row['all_years'];
-            if(empty($payment_year)){
-                $payment_year = date('Y');
+            while($row = mysqli_fetch_array($sql_payment_years)){
+                $payment_year = $row['all_years'];
+                if(empty($payment_year)){
+                    $payment_year = date('Y');
+                }
+                ?>
+                <option <?php if($year == $payment_year){ echo "selected"; } ?> > <?php echo $payment_year; ?></option>
+
+                <?php
             }
             ?>
-            <option <?php if($year == $payment_year){ echo "selected"; } ?> > <?php echo $payment_year; ?></option>
 
-            <?php
-        }
-        ?>
+        </select>
+    </form>
 
-    </select>
-</form>
+    <!-- Icon Cards-->
+    <div class="row">
 
-<!-- Icon Cards-->
-<div class="row">
+        <div class="col-lg-4 col-6">
+            <!-- small box -->
+            <a class="small-box bg-secondary" href="clients.php?date_from=<?php echo $year; ?>-01-01&date_to=<?php echo $year; ?>-12-31">
+                <div class="inner">
+                    <h3><?php echo $clients_added; ?></h3>
+                    <p>New Clients</p>
+                </div>
+                <div class="icon">
+                    <i class="fa fa-users"></i>
+                </div>
+            </a>
+        </div>
+        <!-- ./col -->
 
-    <div class="col-lg-4 col-6">
-        <!-- small box -->
-        <a class="small-box bg-secondary" href="clients.php?date_from=<?php echo $year; ?>-01-01&date_to=<?php echo $year; ?>-12-31">
-            <div class="inner">
-                <h3><?php echo $clients_added; ?></h3>
-                <p>New Clients</p>
-            </div>
-            <div class="icon">
-                <i class="fa fa-users"></i>
-            </div>
-        </a>
-    </div>
-    <!-- ./col -->
+        <div class="col-lg-4 col-6">
+            <!-- small box -->
+            <a class="small-box bg-danger" href="tickets.php">
+                <div class="inner">
+                    <h3><?php echo $active_tickets; ?></h3>
+                    <p>Active Tickets</p>
+                </div>
+                <div class="icon">
+                    <i class="fa fa-ticket-alt"></i>
+                </div>
+            </a>
+        </div>
+        <!-- ./col -->
 
-    <div class="col-lg-4 col-6">
-        <!-- small box -->
-        <a class="small-box bg-danger" href="tickets.php">
-            <div class="inner">
-                <h3><?php echo $active_tickets; ?></h3>
-                <p>Active Tickets</p>
-            </div>
-            <div class="icon">
-                <i class="fa fa-ticket-alt"></i>
-            </div>
-        </a>
-    </div>
-    <!-- ./col -->
+        <div class="col-lg-4 col-6">
+            <!-- small box -->
+            <a class="small-box bg-warning">
+                <div class="inner">
+                    <h3><?php echo $expiring_domains; ?></h3>
+                    <p>Expiring Domains</p>
+                </div>
+                <div class="icon">
+                    <i class="fa fa-globe"></i>
+                </div>
+            </a>
+        </div>
+        <!-- ./col -->
 
-</div> <!-- row -->
+        <div class="col-lg-4 col-6">
+            <!-- small box -->
+            <a class="small-box bg-primary">
+                <div class="inner">
+                    <h3><?php echo $expiring_certificates; ?></h3>
+                    <p>Expiring Certificates</p>
+                </div>
+                <div class="icon">
+                    <i class="fa fa-lock"></i>
+                </div>
+            </a>
+        </div>
+        <!-- ./col -->
+
+    </div> <!-- row -->
 
 <?php include("footer.php"); ?>
\ No newline at end of file