diff --git a/client/src/panels/unitcontrolpanel.ts b/client/src/panels/unitcontrolpanel.ts
index c6f406fb..5960a3e7 100644
--- a/client/src/panels/unitcontrolpanel.ts
+++ b/client/src/panels/unitcontrolpanel.ts
@@ -308,8 +308,8 @@ export class UnitControlPanel extends Panel {
             this.#advancedSettingsDialog.toggleAttribute("data-show-tasking", tanker || AWACS);
             this.#advancedSettingsDialog.toggleAttribute("data-show-tanker", tanker);
             this.#advancedSettingsDialog.toggleAttribute("data-show-AWACS", AWACS);
-            this.#advancedSettingsDialog.toggleAttribute("data-show-TACAN", tanker);
-            this.#advancedSettingsDialog.toggleAttribute("data-show-radio", tanker || AWACS);
+            this.#advancedSettingsDialog.toggleAttribute("data-show-TACAN", tanker || ["Aircraft Carrier", "Super Aircraft Carrier"].includes(units[0].getType()));
+            this.#advancedSettingsDialog.toggleAttribute("data-show-radio", tanker || AWACS || ["Aircraft Carrier", "Super Aircraft Carrier"].includes(units[0].getType()));
 
             /* Set common properties */
             // Name
diff --git a/client/views/other/dialogs.ejs b/client/views/other/dialogs.ejs
index cb4a8b0c..af3974a0 100644
--- a/client/views/other/dialogs.ejs
+++ b/client/views/other/dialogs.ejs
@@ -104,14 +104,14 @@
                 <hr>
             </div>
             <div id="TACAN-checkbox" class="ol-checkbox">
-                <label title="Turn ON the A/A TACAN">
+                <label title="Turn ON the TACAN">
                     <input type="checkbox" />
-                    Use A/A TACAN
+                    Activate TACAN
                 </label>
             </div>
 
             <div class="ol-group">
-                <label>A/A TACAN: </label>
+                <label>TACAN: </label>
         
                 <div class="ol-group">
                     <div id="TACAN-channel" class="ol-text-input">