diff --git a/client/views/other/dialogs.ejs b/client/views/other/dialogs.ejs
index 738bc97d..9b4c52ae 100644
--- a/client/views/other/dialogs.ejs
+++ b/client/views/other/dialogs.ejs
@@ -102,30 +102,6 @@
             </div>
         </div>
 
-        <!-- Tasking -->
-        <!--
-        <div id="tasking">
-            <div class="ol-group">
-                <h4>Tasking</h4>
-                <hr>
-            </div>
-            
-            <div id="tanker-checkbox" class="ol-checkbox">
-                <label title="The unit will operate as Air to Air Refuelling tanker for airplanes that have a compatible refuelling system">
-                    <input type="checkbox" />
-                    Operate as AAR tanker
-                </label>
-            </div>
-
-            <div id="AWACS-checkbox" class="ol-checkbox">
-                <label title="The unit will operate as AWACS on datalink">
-                    <input type="checkbox" />
-                    Operate as AWACS
-                </label>
-            </div>
-        </div>
-    -->
-
         <!-- TACAN options -->
         <div id="TACAN-options">
             <div class="ol-group">
@@ -144,7 +120,7 @@
         
                 <div class="ol-group">
                     <div id="TACAN-channel" class="ol-text-input">
-                        <input type="number" min="1" max="126" step="1" value="40">
+                        <input type="number" onkeypress='return event.charCode >= 48 && event.charCode <= 57' onkeyup="if (value > 126) value = 126;">
                     </div>
                 
                     <div id="TACAN-XY" class="ol-select">
@@ -172,7 +148,7 @@
             
                 <div class="ol-group">
                     <div id="radio-mhz" class="ol-text-input">
-                        <input type="number" min="1" max="999" step="1" value="260">
+                        <input type="number" onkeypress='return event.charCode >= 48 && event.charCode <= 57' onkeyup="if (value > 999) value = 999;">
                     </div>
                                     
                     <div id="radio-decimals" class="ol-select">
diff --git a/src/core/src/unit.cpp b/src/core/src/unit.cpp
index 6bcf1b10..8331b665 100644
--- a/src/core/src/unit.cpp
+++ b/src/core/src/unit.cpp
@@ -538,6 +538,12 @@ void Unit::setTACAN(DataTypes::TACAN newTACAN, bool force)
 		TACAN = newTACAN;
 		if (TACAN.isOn) {
 			std::ostringstream commandSS;
+
+			if (TACAN.channel < 0)
+				TACAN.channel = 0;
+			if (TACAN.channel > 126)
+				TACAN.channel = 126;
+
 			commandSS << "{"
 				<< "id = 'ActivateBeacon',"
 				<< "params = {"
@@ -575,6 +581,12 @@ void Unit::setRadio(DataTypes::Radio newRadio, bool force)
 		std::ostringstream commandSS;
 		Command* command;
 
+		if (radio.frequency < 0)
+			radio.frequency = 0;
+		
+		if (radio.frequency > 999000000)
+			radio.frequency = 999000000;
+
 		commandSS << "{"
 			<< "id = 'SetFrequency',"
 			<< "params = {"