diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php
index 129669559..0d4a0e3fe 100644
--- a/application/controllers/Satellite.php
+++ b/application/controllers/Satellite.php
@@ -383,7 +383,7 @@ class Satellite extends CI_Controller {
 		$satellites = $this->satellite_model->get_all_satellites_with_tle();
 		foreach ($satellites as $sat) {			// Loop through known SATs
 			if ( (count($input_sat) > 0) && !((count($input_sat) == 1) && (($input_sat[0] ?? '') == '')) ) {		// User wants specific SATs (which isn't "All" or empty)??
-				if (in_array($sat->satname,$input_sat)) {
+				if (in_array($sat->satname,$input_sat) || in_array($sat->displayname,$input_sat)) {
 					$tles[]=$this->satellite_model->get_tle($sat->satname);
 				} else {
 					continue;
@@ -437,7 +437,7 @@ class Satellite extends CI_Controller {
 			try {
 				$temp = preg_split('/\n/', $sat_tle->tle);
 
-				$tle     = new Predict_TLE($sat_tle->satellite, $temp[0], $temp[1]); // Instantiate it
+				$tle     = new Predict_TLE(($sat_tle->satellite ? $sat_tle->satellite : $sat_tle->displayname), $temp[0], $temp[1]); // Instantiate it
 				$sat     = new Predict_Sat($tle); // Load up the satellite data
 
 				$now     = $this->get_daynum_from_date($date)+($mintime/24); // get the current time as Julian Date (daynum)
diff --git a/application/models/Satellite_model.php b/application/models/Satellite_model.php
index 46a7d0784..7ca58c036 100644
--- a/application/models/Satellite_model.php
+++ b/application/models/Satellite_model.php
@@ -14,13 +14,14 @@ class Satellite_model extends CI_Model {
 
 	function get_satellite_information($satname = null) {
 		$bindings = [];
-		$sql = "select satellite.id, satellite.name as satname, satellitemode.name as modename, satellite.displayname, satellite.orbit, satellite.lotw as lotw, tle.updated, satellitemode.uplink_mode, satellitemode.downlink_mode, FORMAT((satellitemode.uplink_freq / 1000000), 3) AS uplink_freq, FORMAT((satellitemode.downlink_freq / 1000000), 3) AS downlink_freq
+		$sql = "select satellite.id, coalesce(nullif(satellite.name, ''), satellite.displayname) as satname, satellitemode.name as modename, satellite.displayname, satellite.orbit, satellite.lotw as lotw, tle.updated, satellitemode.uplink_mode, satellitemode.downlink_mode, FORMAT((satellitemode.uplink_freq / 1000000), 3) AS uplink_freq, FORMAT((satellitemode.downlink_freq / 1000000), 3) AS downlink_freq
 		from satellite
 		left outer join satellitemode on satellite.id = satellitemode.satelliteid
 		left outer join tle on satellite.id = tle.satelliteid ";
 
 		if ($satname != null) {
-			$sql .= " where satellite.name = ? ";
+			$sql .= " where satellite.name = ? or satellite.displayname = ?";
+			$bindings[] = $satname;
 			$bindings[] = $satname;
 		}
 
@@ -193,6 +194,7 @@ class Satellite_model extends CI_Model {
 		$this->db->select('satellite.name AS satellite, satellite.displayname AS displayname, tle.tle, tle.updated');
 		$this->db->join('tle', 'satellite.id = tle.satelliteid');
 		$this->db->where('name', $sat);
+		$this->db->or_where('displayname', $sat);
 		$query = $this->db->get('satellite');
 		return $query->row();
 	}
diff --git a/application/views/satellite/flightpath.php b/application/views/satellite/flightpath.php
index aad4b619a..4077d687a 100644
--- a/application/views/satellite/flightpath.php
+++ b/application/views/satellite/flightpath.php
@@ -40,7 +40,7 @@
 			<label class="my-1 me-2" id="satslabel" for="distplot_sats"><?= __("Satellite"); ?></label>
 			<select class="form-select my-1 me-sm-2 w-auto"  id="sats" onchange="plot_sat()">
 				<?php foreach($satellites as $sat) {
-					echo '<option value="' . $sat->satname . '"';
+					echo '<option value="' . ($sat->satname != null ? $sat->satname : $sat->displayname) . '"';
 					if ($sat->satname == $selsat) { echo ' selected'; }
 					echo '>' . ($sat->satname != null ? ($sat->satname.' ('.$sat->displayname.')') : $sat->displayname). '</option>'."\n";
 				} ?>
diff --git a/application/views/satellite/index.php b/application/views/satellite/index.php
index 4167a7c7f..e707217e7 100644
--- a/application/views/satellite/index.php
+++ b/application/views/satellite/index.php
@@ -62,7 +62,7 @@
 			<tbody>
 				<?php foreach ($satellites as $sat) { ?>
 				<tr>
-					<td style="text-align: center; vertical-align: middle;" class="satellite_<?php echo $sat->id ?>"><?php echo htmlentities($sat->satname) ?></td>
+					<td style="text-align: center; vertical-align: middle;" class="satellite_<?php echo $sat->id ?>"><?php echo htmlentities($sat->satname ?? '') ?></td>
 					<td style="text-align: center; vertical-align: middle;"><?php echo $sat->displayname ? htmlentities($sat->displayname) : '' ?></td>
 					<?php echo '<td style="text-align: center; vertical-align: middle;"><span class="badge ';
 					switch (strtoupper($sat->orbit ?? '')) {
@@ -106,7 +106,7 @@
 					echo '</td>';
 					?>
 					<td style="text-align: center; vertical-align: middle;"><button onclick="editSatelliteDialog(<?php echo $sat->id ?>)" class="btn btn-sm btn-success"><i class="fas fa-edit"></i></i></button></td>
-					<td style="text-align: center; vertical-align: middle;"><button onclick="deleteSatellite('<?php echo addslashes($sat->id); ?>', '<?php echo addslashes(htmlspecialchars($sat->satname, ENT_QUOTES, 'UTF-8')); ?>')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>
+					<td style="text-align: center; vertical-align: middle;"><button onclick="deleteSatellite('<?php echo addslashes($sat->id); ?>', '<?php echo addslashes(htmlspecialchars($sat->satname ?? '', ENT_QUOTES, 'UTF-8')); ?>')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>
 				</tr>
 				<?php } ?>
 			</tbody>
diff --git a/application/views/satellite/pass.php b/application/views/satellite/pass.php
index e2b6d769f..04b48fe44 100644
--- a/application/views/satellite/pass.php
+++ b/application/views/satellite/pass.php
@@ -18,7 +18,7 @@
 				</label>
 				<select id="satlist" multiple class="my-1 me-sm-2 w-auto form-select form-select-sm">
 					<?php foreach($satellites as $sat): ?>
-						<option value="<?= $sat->satname; ?>"><?= $sat->satname; ?></option>
+						<option value="<?= $sat->satname == '' ? $sat->displayname : $sat->satname; ?>"><?= $sat->satname == '' ? $sat->displayname : $sat->satname.' ('.$sat->displayname.')'; ?></option>
 					<?php endforeach; ?>
 				</select>
 			</div>
diff --git a/application/views/satellite/passtable.php b/application/views/satellite/passtable.php
index ba0ab146d..636120148 100644
--- a/application/views/satellite/passtable.php
+++ b/application/views/satellite/passtable.php
@@ -28,7 +28,7 @@ if (isset($filtered)) {
 				$tca=sat2pol($max_el_az,$max_el,$scale);
 				$control = array(2 * $tca[0] - ($aos[0] + $los[0]) / 2, 2 * $tca[1] - ($aos[1] + $los[1]) / 2);	// Calc Controlpoints for Bezier-Curve
 				echo '<tr>';
-				echo '<td>' . $pass->satname . ' <i class="satelliteinfo fa fa-info-circle"></i></td>';
+				echo '<td>' . ($pass->satname != '' ? $pass->satname : $pass->displayname) . ' <i class="satelliteinfo fa fa-info-circle"></i></td>';
 				echo '<td>' . Predict_Time::daynum2readable($pass->aos, $zone, $format) . '<span style="margin-left: 10px; display: inline-block;"><a href="' . $ics.'" target="newics"><i class="fas fa-calendar-plus"></i></a><span></td>';
 				echo '<td>' . Predict_Time::daynum2readable($pass->los, $zone, $format) . '</td>';
 				echo '<td>' . returntimediff(Predict_Time::daynum2readable($pass->aos, $zone, $format), Predict_Time::daynum2readable($pass->los, $zone, $format), $format) . '</td>';