diff --git a/app/Controllers/Expenses.php b/app/Controllers/Expenses.php
index 2135df26f..f24fe5ce5 100644
--- a/app/Controllers/Expenses.php
+++ b/app/Controllers/Expenses.php
@@ -192,19 +192,6 @@ class Expenses extends Secure_Controller
 		}
 	}
 
-	/**
-	 * Checks the expense amount for validity. Used in app\Views\expenses\form.php
-	 *
-	 * @return void
-	 * @noinspection PhpUnused
-	 */
-	public function ajax_check_amount(): void
-	{
-		$value = $this->request->getPost();
-		$parsed_value = filter_var(prepare_decimal(array_pop($value)), FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-		echo json_encode (['success' => $parsed_value !== false]);
-	}
-
 	/**
 	 * @return void
 	 */
diff --git a/app/Views/expenses/form.php b/app/Views/expenses/form.php
index 411365b20..80864f180 100644
--- a/app/Views/expenses/form.php
+++ b/app/Views/expenses/form.php
@@ -169,23 +169,12 @@ $(document).ready(function()
 {
 	<?= view('partial/datepicker_locale') ?>
 
-	var amount_validator = function(field) {
-		return {
-			url: "<?= esc("$controller_name/ajax_check_amount") ?>",
-			type: 'POST',
-			dataFilter: function(data) {
-				var response = JSON.parse(data);
-				return response.success;
-			}
-		}
-	}
-
 	$('#supplier_name').click(function() {
 		$(this).attr('value', '');
 	});
 
 	$('#supplier_name').autocomplete({
-		source: '<?= esc(site_url("suppliers/suggest"), 'url') ?>',
+		source: '<?= "suppliers/suggest" ?>',
 		minChars:0,
 		delay:10,
 		select: function (event, ui) {
@@ -240,6 +229,7 @@ $(document).ready(function()
 
 		rules:
 		{
+			supplier_name: 'required',
 			category: 'required',
 			date:
 			{
@@ -248,11 +238,11 @@ $(document).ready(function()
 			amount:
 			{
 				required: true,
-				remote: amount_validator('#amount')
+				remote: "<?= "$controller_name/checkNumeric" ?>"
 			},
 			tax_amount:
 			{
-				remote: amount_validator('#tax_amount')
+				remote: "<?= "$controller_name/checkNumeric" ?>"
 			}
 		},