diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index 24be7539..cbeb44fa 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -42,9 +42,9 @@ class Logbook_model extends CI_Model {
 			'COL_RST_SENT' => $this->input->post('rst_sent'),
 			'COL_NAME' => $this->input->post('name'),
 			'COL_COMMENT' => $this->input->post('comment'),
-			'COL_SAT_NAME' => $this->input->post('sat_name'),
-			'COL_SAT_MODE' => $this->input->post('sat_mode'),
-			'COL_GRIDSQUARE' => trim($this->input->post('locator')),
+			'COL_SAT_NAME' => strtoupper($this->input->post('sat_name')),
+			'COL_SAT_MODE' => strtoupper($this->input->post('sat_mode')),
+			'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))),
 			'COL_COUNTRY' => $this->input->post('country'),
 			'COL_MY_RIG' => $this->input->post('equipment'),
 			'COL_QSLSDATE' => date('Y-m-d'),
@@ -58,7 +58,7 @@ class Logbook_model extends CI_Model {
 			'COL_QTH' => $this->input->post('qth'),
 			'COL_PROP_MODE' => $prop_mode,
 			'COL_IOTA' => $this->input->post('iota_ref'),
-			'COL_MY_GRIDSQUARE' => $locator,
+			'COL_MY_GRIDSQUARE' => strtoupper($locator),
 			'COL_DISTANCE' => "0",
 			'COL_FREQ_RX' => 0,
 			'COL_BAND_RX' => null,
@@ -116,9 +116,9 @@ class Logbook_model extends CI_Model {
                                 'COL_RST_SENT' => $this->input->post('rst_sent'),
                                 'COL_NAME' => $this->input->post('name'),
                                 'COL_COMMENT' => $this->input->post('comment'),
-                                'COL_SAT_NAME' => $this->input->post('sat_name'),
-                                'COL_SAT_MODE' => $this->input->post('sat_mode'),
-                                'COL_GRIDSQUARE' => trim($this->input->post('locator')),
+                                'COL_SAT_NAME' => strtoupper($this->input->post('sat_name')),
+                                'COL_SAT_MODE' => strtoupper($this->input->post('sat_mode')),
+                                'COL_GRIDSQUARE' => strtoupper(trim($this->input->post('locator'))),
                                 'COL_COUNTRY' => $this->input->post('country'),
                                 'COL_MY_RIG' => $this->input->post('equipment'),
                                 'COL_QSLSDATE' => date('Y-m-d'),
@@ -174,21 +174,21 @@ class Logbook_model extends CI_Model {
 		   'COL_MODE' => $this->input->post('mode'),
 		   'COL_RST_RCVD' => $this->input->post('rst_recv'),
 		   'COL_RST_SENT' => $this->input->post('rst_sent'),
-           'COL_GRIDSQUARE' => $this->input->post('locator'),
+		   'COL_GRIDSQUARE' => $this->input->post('locator'),
 		   'COL_COMMENT' => $this->input->post('comment'),
 		   'COL_NAME' => $this->input->post('name'),
 		   'COL_SAT_NAME' => $this->input->post('sat_name'),
 		   'COL_SAT_MODE' => $this->input->post('sat_mode'),
-           'COL_QSLSDATE' => date('Y-m-d'),
-           'COL_QSLRDATE' => date('Y-m-d'),
-           'COL_QSL_SENT' => $this->input->post('qsl_sent'),
-           'COL_QSL_RCVD' => $this->input->post('qsl_recv'),
-           'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
-           'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
-           'COL_IOTA' => $this->input->post('iota_ref'),
-           'COL_QTH' => $this->input->post('qth'),
-           'COL_FREQ_RX' => '0',
-           'COL_COUNTRY' => $this->input->post('country'),
+		   'COL_QSLSDATE' => date('Y-m-d'),
+		   'COL_QSLRDATE' => date('Y-m-d'),
+		   'COL_QSL_SENT' => $this->input->post('qsl_sent'),
+		   'COL_QSL_RCVD' => $this->input->post('qsl_recv'),
+		   'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
+		   'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
+		   'COL_IOTA' => $this->input->post('iota_ref'),
+		   'COL_QTH' => $this->input->post('qth'),
+		   'COL_FREQ_RX' => '0',
+		   'COL_COUNTRY' => $this->input->post('country'),
 		);
 
 		$this->db->where('COL_PRIMARY_KEY', $this->input->post('id'));