diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index 662c6e59..471a6547 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -35,14 +35,19 @@
                         <div class="form-row">
                             <div class="form-group col-md-2">
                                 <label for="start_date"><?php echo $this->lang->line('general_word_date'); ?></label>
-                                <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>">
+                                <input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
 
                             <div class="form-group col-md-1">
                                 <label for="start_time"><?php echo $this->lang->line('general_word_time'); ?></label>
-                                <input type="text" class="form-control form-control-sm input_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_time'); } else {echo date('H:i'); } ?>" size="7">
+                                <input type="text" class="form-control form-control-sm input_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_time'); } else {echo date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : "");  ?> >
                             </div>
 
+                            <?php if ( $_GET['manual'] == 0 ) { ?>
+                              <input class="input_time" type="hidden" id="start_time"  name="start_time"value="<?php echo date('H:i'); ?>" />
+                              <input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date('d-m-Y'); ?>" />
+                            <?php } ?>
+
                             <div class="form-group col-md-2">
                                 <label for="mode"><?php echo $this->lang->line('gen_hamradio_mode'); ?></label>
                                 <select id="mode" class="form-control mode form-control-sm" name="mode">
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 87a6a927..6cf8adf4 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2397,7 +2397,10 @@ function deleteQsl(id) {
 	}
 </script>
 <?php if ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add" ) { ?>
-    <script src="<?php echo base_url() ;?>assets/js/sections/contesting.js"></script>
+    <script>
+        var manual = <?php echo $_GET['manual']; ?>;
+    </script>
+    <script src="<?php echo base_url() ;?>assets/js/sections/contesting.js?v2"></script>
 <?php } ?>
 
 <?php if ($this->uri->segment(1) == "station") { ?>
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 75906998..e8d096e9 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -68,10 +68,12 @@
 							<a class="dropdown-item" href="<?php echo site_url('qso?manual=0');?>" title="Log Live QSOs">Live QSO</a>
 							<div class="dropdown-divider"></div>
 							<a class="dropdown-item" href="<?php echo site_url('qso?manual=1');?>" title="Log QSO made in the past">Post QSO</a>
-                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="<?php echo site_url('contesting');?>" title="Log contest QSOs">Contest Logging</a>
-                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"> View QSL</a>
+							<div class="dropdown-divider"></div>
+							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=0');?>" title="Live contest QSOs">Live Contest Logging</a>
+							<div class="dropdown-divider"></div>
+							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=1');?>" title="Post contest QSOs">Post Contest Logging</a>
+							<div class="dropdown-divider"></div>
+							<a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"> View QSL</a>
 						</div>
         	</li>
 
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index c6afd092..4740b50c 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -51,21 +51,23 @@ $('#exchangetype').change(function () {
 });
 
 // realtime clock
-$(function ($) {
-	var options = {
-		utc: true,
-		format: '%H:%M:%S'
-	}
-	$('.input_time').jclock(options);
-});
+if ( ! manual ) {
+	$(function ($) {
+		var options = {
+			utc: true,
+			format: '%H:%M:%S'
+		}
+		$('.input_time').jclock(options);
+	});
 
-$(function ($) {
-	var options = {
-		utc: true,
-		format: '%d-%m-%Y'
-	}
-	$('.input_date').jclock(options);
-});
+	$(function ($) {
+		var options = {
+			utc: true,
+			format: '%d-%m-%Y'
+		}
+		$('.input_date').jclock(options);
+	});
+}
 
 // We don't want spaces to be written in callsign
 $(function () {