diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index e69c831a..d7550233 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -102,6 +102,7 @@ class QSO extends CI_Controller {
 	
 		$this->load->model('logbook_model');
 		$this->load->model('user_model');
+		$this->load->model('modes');
 		if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
 		$query = $this->logbook_model->qso_info($this->uri->segment(3));
 		
@@ -114,6 +115,7 @@ class QSO extends CI_Controller {
         $data['qso'] = $query->row();
         $data['dxcc'] = $this->logbook_model->fetchDxcc();
         $data['iota'] = $this->logbook_model->fetchIota();
+		$data['modes'] = $this->modes->all();
 		
 		if ($this->form_validation->run() == FALSE)
 		{
diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php
index 63606e93..a7ca1c8d 100755
--- a/application/views/qso/edit.php
+++ b/application/views/qso/edit.php
@@ -70,12 +70,11 @@
                     <div class="form-group col-sm-6">
                         <label for="freq">Mode</label>
                             <select id="mode" class="form-control mode form-control-sm" name="mode">
-                                <?php
-                                $this->load->library('frequency');
-                                foreach(Frequency::modes as $mode){
-                                    printf("<option value=\"%s\" %s>%s</option>", $mode, $qso->COL_MODE==$mode?"selected=\"selected\"":"",$mode);
-                                }
-                                ?>
+                  <?php
+                      foreach($modes->result() as $mode){
+                        printf("<option value=\"%s\" %s>%s</option>", $mode->mode, $this->session->userdata('mode')==$mode->mode?"selected=\"selected\"":"",$mode->mode);
+                      }
+                  ?>
                             </select>
                     </div>