diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index c613886a4..5ac983086 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -234,7 +234,7 @@ $(document).ready(function()
 		var data = { number_locale: $('#number_locale').val() };
 		data[field] = value;
 		$.post("<?php echo site_url($controller_name . '/ajax_check_number_locale')?>",
-			$.extend(csrf_form_base(), data),
+			data,
 			function(response) {
 				$('#number_locale_example').text(response.number_locale_example);
 			},
@@ -253,10 +253,10 @@ $(document).ready(function()
 				{
 					url: "<?php echo site_url($controller_name . '/ajax_check_number_locale')?>",
 					type: 'POST',
-					data: $.extend(csrf_form_base(), {
+					data: {
 						'number_locale': $('#number_locale').val(),
 						'thousands_separator': $('#thousands_separator').is(':checked')
-					}),
+					},
 					dataFilter: function(data) {
 						setup_csrf_token();
 						var response = JSON.parse(data);
diff --git a/application/views/configs/mailchimp_config.php b/application/views/configs/mailchimp_config.php
index 6cbf2b060..6be5ebd6d 100644
--- a/application/views/configs/mailchimp_config.php
+++ b/application/views/configs/mailchimp_config.php
@@ -50,10 +50,9 @@
 $(document).ready(function()
 {
 	$('#mailchimp_api_key').change(function() {
-		$.post("<?php echo site_url($controller_name . '/ajax_check_mailchimp_api_key')?>",
-			$.extend(csrf_form_base(), {
+		$.post("<?php echo site_url($controller_name . '/ajax_check_mailchimp_api_key')?>", {
 				'mailchimp_api_key': $('#mailchimp_api_key').val()
-			}),
+			},
 			function(response) {
 				$.notify(response.message, {type: response.success ? 'success' : 'danger'} );
 				$('#mailchimp_list_id').empty();
diff --git a/application/views/customers/form.php b/application/views/customers/form.php
index e08b4abea..43c3a1e3b 100644
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -460,10 +460,10 @@ $(document).ready(function()
 				{
 					url: "<?php echo site_url($controller_name . '/ajax_check_email')?>",
 					type: 'POST',
-					data: $.extend(csrf_form_base(), {
+					data: {
 						'person_id': '<?php echo $person_info->person_id; ?>'
 						// email is posted by default
-					})
+					}
 				}
 			},
 			account_number:
@@ -472,10 +472,10 @@ $(document).ready(function()
 				{
 					url: "<?php echo site_url($controller_name . '/ajax_check_account_number')?>",
 					type: 'POST',
-					data: $.extend(csrf_form_base(), {
+					data: {
 						'person_id': '<?php echo $person_info->person_id; ?>'
 						// account_number is posted by default
-					})
+					}
 				}
 			}
 		},
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index 434a116cc..6004b96e1 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -76,7 +76,7 @@ $(document).ready(function()
 		source: '<?php echo site_url("customers/suggest"); ?>',
 		minChars: 0,
 		delay: 15, 
-		cacheLength: 1,
+	   	cacheLength: 1,
 		appendTo: '.modal-content',
 		select: fill_value,
 		focus: fill_value
@@ -125,9 +125,9 @@ $(document).ready(function()
 				{
 					url: "<?php echo site_url($controller_name . '/ajax_check_number_giftcard')?>",
 					type: 'POST',
-					data: $.extend(csrf_form_base(), {
+					data: {
 						'amount': $('#giftcard_amount').val()
-					}),
+					},
 					dataFilter: function(data) {
 						setup_csrf_token();
 						var response = JSON.parse(data);
diff --git a/application/views/partial/header_js.php b/application/views/partial/header_js.php
index 025cd157e..c61e507ac 100644
--- a/application/views/partial/header_js.php
+++ b/application/views/partial/header_js.php
@@ -16,8 +16,6 @@
 		from: '<?php echo $this->config->item('notify_vertical_position'); ?>'
 	}});
 
-	var post = $.post;
-
 	var csrf_token = function() {
 		return Cookies.get('<?php echo $this->config->item('csrf_cookie_name'); ?>');
 	};
@@ -26,9 +24,23 @@
 		return { <?php echo $this->security->get_csrf_token_name(); ?> : function () { return csrf_token();  } };
 	};
 
-	$.post = function() {
-		arguments[1] = csrf_token() ? $.extend(arguments[1], csrf_form_base()) : arguments[1];
-		post.apply(this, arguments);
+	var ajax = $.ajax;
+
+	$.ajax = function() {
+	    var args = arguments[0];
+
+		if (args['type'] && args['type'].toLowerCase() == 'post' && csrf_token()) {
+			if (typeof args['data'] === 'string')
+			{
+				args['data'] += '&' + $.param(csrf_form_base());
+			}
+			else
+			{
+				args['data'] = $.extend(args['data'], csrf_form_base());
+			}
+		}
+
+		return ajax.apply(this, arguments);
 	};
 
 	var setup_csrf_token = function() {
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index 8f664541e..2c2048b60 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -191,12 +191,12 @@ $(document).ready(function()
 				{
 					url: "<?php echo site_url($controller_name . '/check_invoice_number')?>",
 					type: 'POST',
-					data: $.extend(csrf_form_base(), {
-						'sale_id' : <?php echo $sale_info['sale_id']; ?>,
-						'invoice_number' : function() {
+					data: {
+						'sale_id': <?php echo $sale_info['sale_id']; ?>,
+						'invoice_number': function() {
 							return $('#invoice_number').val();
 						}
-					})
+					}
 				}
 			}
 		},