diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index 27af385aa..26e1aca17 100644
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -31,7 +31,11 @@ class QSO extends CI_Controller {
 			show_404();
 		}
 
-		$data['active_station_profile'] = $this->stations->find_active();
+		if ($this->stations->check_station_is_accessible($this->session->userdata('station_profile_id') ?? 0)) {	// Last Station from session accessible? Take it!
+			$data['active_station_profile'] = $this->session->userdata('station_profile_id');
+		} else {
+			$data['active_station_profile'] =$this->stations->find_active();
+		}
 
 		$data['notice'] = false;
 		$data['stations'] = $this->stations->all_of_user();
@@ -88,6 +92,13 @@ class QSO extends CI_Controller {
 			$data['user_dok_to_qso_tab'] = 0;
 		}
 
+		$qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'station','option_key'=>'show'))->result();
+		if (count($qkey_opt)>0) {
+			$data['user_station_to_qso_tab'] = $qkey_opt[0]->option_value;
+		} else {
+			$data['user_station_to_qso_tab'] = 0;
+		}
+
 		// Get status of DX Waterfall enable option
 		$qkey_opt=$this->user_options_model->get_options('dxwaterfall',array('option_name'=>'enable','option_key'=>'boolean'))->result();
 		if (count($qkey_opt)>0) {
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 15dbc6cad..e1d546726 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -341,6 +341,20 @@ if (typeof window.DX_WATERFALL_FIELD_MAP === 'undefined') {
               </div>
               <?php } ?>
 
+              <?php if ($user_station_to_qso_tab ?? false) { ?>
+              <div class="mb-3">
+              <label for="stationProfile"><?= __("Station Location"); ?></label>
+              <select id="stationProfile" class="form-select" name="station_profile" onChange="panMap(this.value);">
+                <?php
+                   $power = '';
+                      foreach ($stations->result() as $stationrow) {
+                ?>
+                <option value="<?php echo $stationrow->station_id; ?>" <?php if($active_station_profile == $stationrow->station_id) { echo "selected=\"selected\""; $power = $stationrow->station_power; $station_callsign = $stationrow->station_callsign; } ?>><?php echo $stationrow->station_profile_name; ?></option>
+                <?php } ?>
+              </select>
+            </div>
+              <?php } ?>
+
               <div class="mb-3 row">
                 <label for="qth" class="col-sm-3 col-form-label"><?= __("Location"); ?></label>
                 <div class="col-sm-9">
@@ -369,6 +383,7 @@ if (typeof window.DX_WATERFALL_FIELD_MAP === 'undefined') {
 
           <!-- Station Panel Data -->
           <div class="tab-pane fade" id="station" role="tabpanel" aria-labelledby="station-tab">
+            <?php if (!$user_station_to_qso_tab ?? false) { ?>
             <div class="mb-3">
               <label for="stationProfile"><?= __("Station Location"); ?></label>
               <select id="stationProfile" class="form-select" name="station_profile" onChange="panMap(this.value);">
@@ -380,6 +395,7 @@ if (typeof window.DX_WATERFALL_FIELD_MAP === 'undefined') {
                 <?php } ?>
               </select>
             </div>
+		<?php } ?>
 
             <div class="mb-3">
               <label for="radio"><?= __("Radio"); ?></label>