diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php
index 2f3306545..ab39acb7d 100644
--- a/application/controllers/Satellite.php
+++ b/application/controllers/Satellite.php
@@ -21,6 +21,16 @@ class Satellite extends CI_Controller {
 
 		$pageData['satellites'] = $this->satellite_model->get_all_satellites();
 
+		if($this->session->userdata('user_date_format')) {
+			// If Logged in and session exists
+			$custom_date_format = $this->session->userdata('user_date_format');
+		} else {
+			// Get Default date format from /config/wavelog.php
+			$custom_date_format = $this->config->item('qso_date_format');
+		}
+
+		$pageData['custom_date_format'] = $custom_date_format;
+
 		$footerData = [];
 		$footerData['scripts'] = [
 			'assets/js/sections/satellite.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/satellite.js")),
diff --git a/application/views/satellite/index.php b/application/views/satellite/index.php
index 75f68980c..5040cc0fa 100644
--- a/application/views/satellite/index.php
+++ b/application/views/satellite/index.php
@@ -67,7 +67,7 @@
 					?>
 					<?php echo '<td style="text-align: center; vertical-align: middle;">';
 					if ($sat->updated != null) {
-						echo '<span class="badge bg-success">'.__("Yes").'</span>';
+						echo '<span class="badge bg-success" data-bs-toggle="tooltip" title="Last TLE updated was ' . date($custom_date_format . " H:i", strtotime($sat->updated)) . '">'.__("Yes").'</span>';
 					} else {
 						echo '<span class="badge bg-danger">'.__("No").'</span>';
 					}