diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index f3469f4be..65094190c 100644
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -41,14 +41,16 @@ class Radio extends CI_Controller {
 
 		$this->load->model('cat');
 		$query = $this->cat->status();
-		
+
 		if ($query->num_rows() > 0) {
 			echo "<thead><tr>";
 			echo "<th>" . __("Radio") . "</th>";
 			echo "<th>" . __("Frequency") . "</th>";
 			echo "<th>" . __("Mode") . "</th>";
 			echo "<th>" . __("Timestamp") . "</th>";
+			echo "<th></th>";
 			echo "<th>" . __("Options") . "</th>";
+			echo "<th></th>";
 			echo "</tr></thead><tbody>";
 			foreach ($query->result() as $row) {
 				echo "<tr>";
@@ -81,21 +83,38 @@ class Radio extends CI_Controller {
 
 				$phpdate = strtotime($row->timestamp);
 				echo "<td>" . date($custom_date_format . ' H:i:s', $phpdate) . "</td>";
-				echo "<td>
-							<a href=\"" . site_url('radio/set_default_radio') . "/" . $row->id . "\" class=\"btn btn-sm btn-info\"> <i class=\"fas fa-radio\"></i> " . __("Set as default radio") . "</a>
-							<a href=\"" . site_url('radio/delete') . "/" . $row->id . "\" class=\"btn btn-sm btn-danger\"> <i class=\"fas fa-trash-alt\"></i> " . __("Delete") . "</a></td>";
+
+				if ($this->session->userdata('radio') !== '' && $this->session->userdata('radio') == $row->id) {
+					echo '<td><i>' . __("(last used)") . '</i></td>';
+				} else {
+					echo '<td></td>';
+				}
+
+				$defaul_user_radio = $this->user_options_model->get_options('cat', array('option_name' => 'default_radio'))->row()->option_value ?? NULL;
+				if (!$defaul_user_radio) {
+					echo '<td><button id="default_radio_btn_' . $row->id . '" class="btn btn-sm btn-primary ld-ext-right" onclick="set_default_radio(' . $row->id . ')">' . __("Set as default radio") . '<div class="ld ld-ring ld-spin"></div></button</td>';
+				} else {
+					if ($defaul_user_radio !== $row->id) {
+						echo '<td><button id="default_radio_btn_' . $row->id . '" class="btn btn-sm btn-primary ld-ext-right" onclick="set_default_radio(' . $row->id . ')">' . __("Set as default radio") . '<div class="ld ld-ring ld-spin"></div></button</td>';
+					} else {
+						echo '<td><button id="default_radio_btn_' . $row->id . '" class="btn btn-sm btn-secondary ld-ext-right" onclick="release_default_radio(' . $row->id . ')">' . __("Release as default radio") . '<div class="ld ld-ring ld-spin"></div></button</td>';
+					}
+				}
+				echo "<td><a href=\"" . site_url('radio/delete') . "/" . $row->id . "\" class=\"btn btn-sm btn-danger\"> <i class=\"fas fa-trash-alt\"></i> " . __("Delete") . "</a></td>";
 				echo "</tr>";
 			}
 			echo "</tbody>";
 		} else {
 			echo "<thead><tr>";
-			echo "<td colspan=\"4\"><div class=\"alert alert-info text-center\">" . __("No CAT interfaced radios found.") . "</div></td>";
+			echo "<td colspan=\"6\"><div class=\"alert alert-info text-center\">" . __("No CAT interfaced radios found.") . "</div></td>";
 			echo "</tr></thead>";
 		}
 	}
 
 	function json($id) {
 
+		$clean_id = $this->security->xss_clean($id);
+
 		$this->load->model('user_model');
 
 		// Check if users logged in
@@ -114,7 +133,7 @@ class Radio extends CI_Controller {
 
 			$this->load->model('cat');
 
-			$query = $this->cat->radio_status($id);
+			$query = $this->cat->radio_status($clean_id);
 
 			if ($query->num_rows() > 0) {
 				foreach ($query->result() as $row) {
@@ -229,6 +248,9 @@ class Radio extends CI_Controller {
 	}
 
 	function delete($id) {
+
+		$clean_id = $this->security->xss_clean($id);
+
 		// Check Auth
 		$this->load->model('user_model');
 		if (!$this->user_model->authorize(3)) {
@@ -238,11 +260,48 @@ class Radio extends CI_Controller {
 
 		$this->load->model('cat');
 
-		$this->cat->delete($id);
+		$this->cat->delete($clean_id);
+
+		if ($clean_id == $this->user_options_model->get_options('cat', array('option_name' => 'default_radio'))->row()->option_value ?? '') {
+			$this->release_default_radio();
+		}
 
 		$this->session->set_flashdata('message', 'Radio Profile Deleted');
 
 		session_write_close();
 		redirect('radio');
 	}
+
+	function set_default_radio() {
+
+		// we unset the current default radio
+		$this->release_default_radio();
+
+		// get the radio_id from POST
+		$clean_radio_id = $this->security->xss_clean($this->input->post('radio_id'));
+
+		// Check Auth
+		$this->load->model('user_model');
+		if (!$this->user_model->authorize(3)) {
+			$this->session->set_flashdata('notice', 'You\'re not allowed to do that!');
+			redirect('dashboard');
+		}
+
+		// Set the user_option and session data
+		$this->user_options_model->set_option('cat', 'default_radio', array('radio_id' => $clean_radio_id));
+		$this->session->set_userdata('radio', $clean_radio_id);
+	}
+
+	function release_default_radio() {
+		// Check Auth
+		$this->load->model('user_model');
+		if (!$this->user_model->authorize(3)) {
+			$this->session->set_flashdata('notice', 'You\'re not allowed to do that!');
+			redirect('dashboard');
+		}
+
+		// Unset the user_option and session data
+		$this->user_options_model->del_option('cat', 'default_radio');
+		$this->session->unset_userdata('radio');
+	}
 }
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 4e3f0af46..8bffd74e6 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -422,7 +422,7 @@ class User_Model extends CI_Model {
 			'user_eqsl_name'	 => $u->row()->user_eqsl_name,
 			'user_eqsl_qth_nickname' => $u->row()->user_eqsl_qth_nickname,
 			'user_hash'		 => $this->_hash($u->row()->user_id."-".$u->row()->user_type),
-			'radio' => $this->session->userdata('radio') ?? '',
+			'radio' => ((($this->session->userdata('radio') ?? '') == '') ? $this->user_options_model->get_options('cat', array('option_name' => 'default_radio'))->row()->option_value ?? '' : $this->session->userdata('radio')),
 			'station_profile_id' => $this->session->userdata('station_profile_id') ?? '',
 			'user_measurement_base' => $u->row()->user_measurement_base,
 			'user_date_format' => $u->row()->user_date_format,
diff --git a/assets/js/sections/radio.js b/assets/js/sections/radio.js
index 0f3b42dcb..9e2be3327 100644
--- a/assets/js/sections/radio.js
+++ b/assets/js/sections/radio.js
@@ -1,11 +1,37 @@
 $(document).ready(function () {
-
+    // Update the Radio Interfaces every 2 seconds
+    $.get(base_url + 'index.php/radio/status/', function (result) {
+        $('.status').html(result);
+    });
+    $('#radioResultsLoading').hide();
     setInterval(function () {
-        // Update the Radio Interfaces every 2 Seconds
+        // Update the Radio Interfaces every 2 seconds
         $.get(base_url + 'index.php/radio/status/', function (result) {
             $('.status').html(result);
         });
         $('#radioResultsLoading').hide();
     }, 2000);
 
-});
\ No newline at end of file
+});
+
+function set_default_radio(radio_id) {
+    $('#default_radio_btn_' + radio_id).addClass('running').prop('disable', true);
+    $.ajax({
+        type: 'POST',
+        url: base_url + 'index.php/radio/set_default_radio',
+        data: {
+            radio_id: radio_id
+        },
+    });
+}
+
+function release_default_radio(radio_id) {
+    $('#default_radio_btn_' + radio_id).addClass('running').prop('disable', true);
+    $.ajax({
+        type: 'POST',
+        url: base_url + 'index.php/radio/release_default_radio',
+        data: {
+            radio_id: radio_id
+        },
+    });
+}
\ No newline at end of file