diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index fb611848..80cb64b6 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -1296,7 +1296,7 @@ class Logbook_model extends CI_Model {
 
   function get_qso($id) {
     $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, dxcc_entities_2.name as station_country, dxcc_entities_2.end as station_end');
-    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "None") as station_country, dxcc_entities_2.end as station_end');
+    $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end');
     $this->db->from($this->config->item('table_name'));
     $this->db->join('dxcc_entities', $this->config->item('table_name').'.col_dxcc = dxcc_entities.adif', 'left');
     $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id', 'left');
@@ -3291,7 +3291,7 @@ class Logbook_model extends CI_Model {
         $result = $this->wpx($call, 1);                       # use the wpx prefix instead
         if ($result == '') {
           $row['adif'] = 0;
-          $row['entity'] = 'None';
+          $row['entity'] = '- NONE -';
           $row['cqz'] = 0;
           $row['cont'] = '';
           return array($row['adif'], $row['entity'], $row['cqz'], $row['cont']);
@@ -3382,7 +3382,7 @@ class Logbook_model extends CI_Model {
               $result = $this->wpx($call, 1);                       # use the wpx prefix instead
               if ($result == '') {
                 $row['adif'] = 0;
-                $row['entity'] = 'None';
+                $row['entity'] = '- NONE -';
                 $row['cqz'] = 0;
                 $row['long'] = '0';
                 $row['lat'] = '0';
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 37914041..43447135 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -45,7 +45,7 @@
 				<label class="form-label" for="dxcc">DXCC</label>
 				<select class="form-control form-control-sm" id="dxcc" name="dxcc">
 				<option value="">-</option>	
-				<option value="0">None (/MM, /AM)</option>
+				<option value="0">- NONE - (e.g. /MM, /AM)</option>
 					<?php
 					foreach($dxccarray as $dxcc){
 						echo '<option value=' . $dxcc->adif;
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index ab82ebde..73ec5625 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -220,7 +220,7 @@
                                     <div class="form-group col-sm-6">
                                         <label for="dxcc_id">DXCC</label>
                                         <select class="custom-select" id="dxcc_id" name="dxcc_id" required>
-                                            <option value="0">None</option>
+                                            <option value="0">- NONE -</option>
                                             <?php
                                             foreach($dxcc as $d){
                                                 echo '<option value=' . $d->adif;
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 6410760f..1b4f8dd6 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -216,7 +216,7 @@
               <div class="form-group">
                   <label for="dxcc_id"><?php echo $this->lang->line('gen_hamradio_dxcc'); ?></label>
                   <select class="custom-select" id="dxcc_id" name="dxcc_id" required>
-                      <option value="0">None</option>
+                      <option value="0">- NONE -</option>
                       <?php
                       foreach($dxcc as $d){
                           echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 4f2169a0..a50cab54 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -50,7 +50,7 @@
 		    <label for="stationDXCCInput">Station DXCC</label>
 				<?php if ($dxcc_list->num_rows() > 0) { ?>
 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
-				<option value="0" selected>NONE</option>
+				<option value="0" selected>- NONE -</option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';?>
 				</option>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 4aa318d1..f99971ee 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -69,7 +69,7 @@
 						<label for="stationDXCCInput">Station DXCC</label>
 							<?php if ($dxcc_list->num_rows() > 0) { ?>
 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
-							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
+							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>- NONE -</option>
 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')';?>
 							</option>