diff --git a/application/views/configs/email_config.php b/application/views/configs/email_config.php
index 62754b991..430904e1f 100644
--- a/application/views/configs/email_config.php
+++ b/application/views/configs/email_config.php
@@ -121,7 +121,7 @@ $(document).ready(function()
 			$("#mailpath").prop('disabled', false);
 			$("#smtp_host, #smtp_user, #smtp_pass, #smtp_port, #smtp_timeout, #smtp_crypto").prop('disabled', true);
 		}
-		elseif($("#protocol").val() == 'smtp')
+		else if($("#protocol").val() == 'smtp')
 		{
 			$("#smtp_host, #smtp_user, #smtp_pass, #smtp_port, #smtp_timeout, #smtp_crypto").prop('disabled', false);
 			$("#mailpath").prop('disabled', true);
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 5094466dd..83d9ef62c 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -78,7 +78,7 @@
 	<?php $this->load->view('partial/lang_lines'); ?>
 
 	<script type="text/javascript">
-		// live clockf
+		// live clock
 		var clock_tick = function clock_tick() {
 			setInterval('update_clock();', 1000);
 		}
diff --git a/templates/spacelab/views/partial/header.php b/templates/spacelab/views/partial/header.php
index b064a4a6f..628154db8 100644
--- a/templates/spacelab/views/partial/header.php
+++ b/templates/spacelab/views/partial/header.php
@@ -72,20 +72,20 @@
 		<!-- end mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=75d94393ed" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=75d94393ed"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
 	<script type="text/javascript">
 		// live clock
-		var clockTick = function clockTick() {
-			setInterval('updateClock();', 1000);  
+		var clock_tick = function clock_tick() {
+			setInterval('update_clock();', 1000);
 		}
 
 		// start the clock immediatly
-		clockTick();
+		clock_tick();
 
-		function updateClock() {
+		var update_clock = function update_clock() {
 			document.getElementById('liveclock').innerHTML = moment().format("<?php echo dateformat_momentjs($this->config->item('dateformat').' '.$this->config->item('timeformat'))?>");
 		}
 
@@ -93,6 +93,23 @@
 			align: '<?php echo $this->config->item('config_notify_horizontal_position'); ?>',
 			from: '<?php echo $this->config->item('config_notify_vertical_position'); ?>'
 		}});
+
+		var post = $.post;
+
+		$.post = function() {
+			post.call(this, arguments[0], $.extend(arguments[1], {
+				<?php echo $this->security->get_csrf_token_name(); ?> : Cookies.get('<?php echo $this->config->item('csrf_cookie_name'); ?>')
+			}));
+		};
+
+		var setup_csrf = function() {
+			var csrf_cookie_val = Cookies.get('<?php echo $this->config->item('csrf_cookie_name'); ?>');
+			$('input[name="<?php echo $this->security->get_csrf_token_name(); ?>"]').val(csrf_cookie_val);
+		};
+
+		setup_csrf();
+
+		$(document).ajaxComplete(setup_csrf);
 	</script>
 
 	<style type="text/css">