diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index 745fcb8c5..0e557b7e9 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -54,6 +54,13 @@ class QSO extends CI_Controller {
 			$data['user_wwff_to_qso_tab'] = 0;
 		}
 
+		$qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'pota','option_key'=>'show'))->result();
+		if (count($qkey_opt)>0) {
+			$data['user_pota_to_qso_tab'] = $qkey_opt[0]->option_value;
+		} else {
+			$data['user_pota_to_qso_tab'] = 0;
+		}
+
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('start_date', 'Date', 'required');
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 815b22dad..5f760be61 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -100,6 +100,7 @@ class User extends CI_Controller {
 				$data['user_iota_to_qso_tab'] = $this->input->post('user_iota_to_qso_tab');
 				$data['user_sota_to_qso_tab'] = $this->input->post('user_sota_to_qso_tab');
 				$data['user_wwff_to_qso_tab'] = $this->input->post('user_wwff_to_qso_tab');
+				$data['user_pota_to_qso_tab'] = $this->input->post('user_pota_to_qso_tab');
 				$data['language'] = $this->input->post('language');
 				$this->load->view('user/edit', $data);
 			} else {
@@ -143,7 +144,8 @@ class User extends CI_Controller {
 				$this->input->post('user_hamsat_workable_only'),
 				$this->input->post('user_iota_to_qso_tab'),
 				$this->input->post('user_sota_to_qso_tab'),
-				$this->input->post('user_wwff_to_qso_tab')
+				$this->input->post('user_wwff_to_qso_tab'),
+				$this->input->post('user_pota_to_qso_tab')
 				)) {
 				// Check for errors
 				case EUSERNAMEEXISTS:
@@ -548,6 +550,15 @@ class User extends CI_Controller {
 				}
 			}
 
+			if($this->input->post('user_pota_to_qso_tab')) {
+				$data['user_pota_to_qso_tab'] = $this->input->post('user_pota_to_qso_tab', false);
+			} else {
+				$qkey_opt=$this->user_options_model->get_options('qso_tab',array('option_name'=>'pota','option_key'=>'show'))->result();
+				if (count($qkey_opt)>0) {
+					$data['user_pota_to_qso_tab'] = $qkey_opt[0]->option_value;
+				}
+			}
+
 			// [MAP Custom] GET user options //
 			$options_object = $this->user_options_model->get_options('map_custom')->result();
 			if (count($options_object)>0) {
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 9f8610125..b5d1cbe3c 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -151,7 +151,7 @@ class User_Model extends CI_Model {
 		$user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url,
 		$user_default_band, $user_default_confirmation, $user_qso_end_times, $user_quicklog, $user_quicklog_enter,
 		$language, $user_hamsat_key, $user_hamsat_workable_only, $user_iota_to_qso_tab, $user_sota_to_qso_tab,
-		$user_wwff_to_qso_tab) {
+		$user_wwff_to_qso_tab, $user_pota_to_qso_tab) {
 		// Check that the user isn't already used
 		if(!$this->exists($username)) {
 			$data = array(
@@ -214,6 +214,7 @@ class User_Model extends CI_Model {
 			$this->db->query("insert into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $insert_id . ", 'qso_tab','iota','show',".(xss_clean($user_iota_to_qso_tab) == "on" ? 1 : 0).");");
 			$this->db->query("insert into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $insert_id . ", 'qso_tab','sota','show',".(xss_clean($user_sota_to_qso_tab) == "on" ? 1 : 0).");");
 			$this->db->query("insert into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $insert_id . ", 'qso_tab','wwff','show',".(xss_clean($user_wwff_to_qso_tab) == "on" ? 1 : 0).");");
+			$this->db->query("insert into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $insert_id . ", 'qso_tab','pota','show',".(xss_clean($user_pota_to_qso_tab) == "on" ? 1 : 0).");");
 
 			return OK;
 		} else {
@@ -270,6 +271,7 @@ class User_Model extends CI_Model {
 				$this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'qso_tab','iota','show',".(xss_clean($fields['user_iota_to_qso_tab']) == "on" ? 1 : 0).");");
 				$this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'qso_tab','sota','show',".(xss_clean($fields['user_sota_to_qso_tab']) == "on" ? 1 : 0).");");
 				$this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'qso_tab','wwff','show',".(xss_clean($fields['user_wwff_to_qso_tab']) == "on" ? 1 : 0).");");
+				$this->db->query("replace into user_options (user_id, option_type, option_name, option_key, option_value) values (" . $fields['id'] . ", 'qso_tab','pota','show',".(xss_clean($fields['user_pota_to_qso_tab']) == "on" ? 1 : 0).");");
 
 				// Check to see if the user is allowed to change user levels
 				if($this->session->userdata('user_type') == 99) {
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 1e9b0a50f..b08c55b43 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -219,7 +219,7 @@
               <?php } ?>
 
               <?php if ($user_wwff_to_qso_tab) { ?>
-              <div class="mb3 row">
+              <div class="mb-3 row">
                 <label class="col-sm-3 col-form-label" for="wwff_ref"><?php echo lang('gen_hamradio_wwff_reference'); ?></label>
                 <div class="col-sm-7 align-self-center">
                   <input class="form-control" id="wwff_ref" type="text" name="wwff_ref" value="" />
@@ -230,6 +230,18 @@
               </div>
               <?php } ?>
 
+              <?php if ($user_pota_to_qso_tab) { ?>
+              <div class="mb-3 row">
+                <label class="col-sm-3 col-form-label" for="pota_ref"><?php echo lang('gen_hamradio_pota_reference'); ?></label>
+                <div class="col-sm-7 align-self-center">
+                  <input class="form-control" id="pota_ref" type="text" name="pota_ref" value="" />
+                </div>
+                <div class="col-sm-2 align-self-center">
+                  <small id="pota_info" class="btn btn-secondary spw-buttons"></small>
+                </div>
+              </div>
+              <?php } ?>
+
               <div class="mb-3 row">
                 <label for="qth" class="col-sm-3 col-form-label"><?php echo lang('general_word_location'); ?></label>
                 <div class="col-sm-9">
@@ -438,6 +450,7 @@
             </div>
             <?php } ?>
 
+            <?php if (!$user_pota_to_qso_tab) { ?>
             <div class="row">
               <div class="mb-3 col-md-9">
                 <label for="pota_ref"><?php echo lang('gen_hamradio_pota_reference'); ?></label>
@@ -448,6 +461,7 @@
                 <small id="pota_info" class="btn btn-secondary spw-buttons"></small>
               </div>
             </div>
+            <?php } ?>
 
             <div class="mb-3">
               <label for="sig"><?php echo lang('gen_hamradio_sig'); ?></label>
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index a62a9486a..0e00bf91b 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -584,6 +584,10 @@
 												<input name="user_wwff_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="wwffToQsoTab" <?php if ($user_wwff_to_qso_tab) { echo 'checked'; } ?>>
 												<label class="form-check-label" for="wwffToQsoTab" ><?php echo lang('gen_hamradio_wwff_reference'); ?></label>
 											</div>
+											<div class="form-check form-switch">
+												<input name="user_pota_to_qso_tab" class="form-check-input" type="checkbox" role="switch" id="potaToQsoTab" <?php if ($user_pota_to_qso_tab) { echo 'checked'; } ?>>
+												<label class="form-check-label" for="potaToQsoTab" ><?php echo lang('gen_hamradio_pota_reference'); ?></label>
+											</div>
 										</div>
 									</div>
 								</div>