diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php
index a32765ff..07103a83 100644
--- a/application/controllers/Contesting.php
+++ b/application/controllers/Contesting.php
@@ -20,11 +20,13 @@ class Contesting extends CI_Controller {
         $this->load->model('stations');
         $this->load->model('modes');
 		$this->load->model('contesting_model');
+		$this->load->model('bands');
 
 		$data['my_gridsquare'] = $this->stations->find_gridsquare();
         $data['radios'] = $this->cat->radios();
         $data['modes'] = $this->modes->active();
 		$data['contestnames'] = $this->contesting_model->getActivecontests();
+		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
 
 		$this->load->library('form_validation');
 
diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index 471a6547..8e7a5a89 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -65,38 +65,16 @@
                                 <label for="band"><?php echo $this->lang->line('gen_hamradio_band'); ?></label>
 
                                 <select id="band" class="form-control form-control-sm" name="band">
-                                    <optgroup label="HF">
-                                        <option value="160m" <?php if($this->session->userdata('band') == "160m") { echo "selected=\"selected\""; } ?>>160m</option>
-                                        <option value="80m" <?php if($this->session->userdata('band') == "80m") { echo "selected=\"selected\""; } ?>>80m</option>
-                                        <option value="60m" <?php if($this->session->userdata('band') == "60m") { echo "selected=\"selected\""; } ?>>60m</option>
-                                        <option value="40m" <?php if($this->session->userdata('band') == "40m") { echo "selected=\"selected\""; } ?>>40m</option>
-                                        <option value="30m" <?php if($this->session->userdata('band') == "30m") { echo "selected=\"selected\""; } ?>>30m</option>
-                                        <option value="20m" <?php if($this->session->userdata('band') == "20m") { echo "selected=\"selected\""; } ?>>20m</option>
-                                        <option value="17m" <?php if($this->session->userdata('band') == "17m") { echo "selected=\"selected\""; } ?>>17m</option>
-                                        <option value="15m" <?php if($this->session->userdata('band') == "15m") { echo "selected=\"selected\""; } ?>>15m</option>
-                                        <option value="12m" <?php if($this->session->userdata('band') == "12m") { echo "selected=\"selected\""; } ?>>12m</option>
-                                        <option value="10m" <?php if($this->session->userdata('band') == "10m") { echo "selected=\"selected\""; } ?>>10m</option>
-                                    </optgroup>
-
-                                    <optgroup label="VHF">
-                                        <option value="6m" <?php if($this->session->userdata('band') == "6m") { echo "selected=\"selected\""; } ?>>6m</option>
-                                        <option value="4m" <?php if($this->session->userdata('band') == "4m") { echo "selected=\"selected\""; } ?>>4m</option>
-                                        <option value="2m" <?php if($this->session->userdata('band') == "2m") { echo "selected=\"selected\""; } ?>>2m</option>
-                                        <option value="1.25m" <?php if($this->session->userdata('band') == "1.25m") { echo "selected=\"selected\""; } ?>>1.25m</option>
-                                    </optgroup>
-
-                                    <optgroup label="UHF">
-                                        <option value="70cm" <?php if($this->session->userdata('band') == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option>
-                                        <option value="33cm" <?php if($this->session->userdata('band') == "33cm") { echo "selected=\"selected\""; } ?>>33cm</option>
-                                    </optgroup>
-
-                                    <optgroup label="Microwave">
-                                        <option value="23cm" <?php if($this->session->userdata('band') == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option>
-                                        <option value="13cm" <?php if($this->session->userdata('band') == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option>
-                                        <option value="9cm" <?php if($this->session->userdata('band') == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option>
-                                        <option value="6cm" <?php if($this->session->userdata('band') == "6cm") { echo "selected=\"selected\""; } ?>>6cm</option>
-                                        <option value="3cm" <?php if($this->session->userdata('band') == "3cm") { echo "selected=\"selected\""; } ?>>3cm</option>
-                                    </optgroup>
+                                <?php foreach($bands as $key=>$bandgroup) {
+                                    echo '<optgroup label="' . strtoupper($key) . '">';
+                                    foreach($bandgroup as $band) {
+                                        echo '<option value="' . $band . '"';
+                                        if ($this->session->userdata('band') == $band) echo ' selected';
+                                        echo '>' . $band . '</option>'."\n";
+                                    }
+                                    echo '</optgroup>';
+                                    }
+                                ?>
                                 </select>
                             </div>