diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php
index 4d1047cc53..080ca541ae 100644
--- a/app/Http/Controllers/Budget/AvailableBudgetController.php
+++ b/app/Http/Controllers/Budget/AvailableBudgetController.php
@@ -177,12 +177,26 @@ class AvailableBudgetController extends Controller
             $end   = session()->get('end');
             Log::info($e->getMessage());
         }
+
+        // validate amount
+        $amount = (string) $request->get('amount');
+        if ('' === $amount) {
+            session()->flash('error', trans('firefly.invalid_amount'));
+
+            return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+        }
+        if (0 === bccomp('0', $amount)) {
+            session()->flash('error', trans('firefly.invalid_amount'));
+
+            return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+        }
+
         // find currency
         $currency = $this->currencyRepos->find((int) $request->get('currency_id'));
         if (null === $currency) {
             session()->flash('error', trans('firefly.invalid_currency'));
 
-            return redirect(route('budgets.index'));
+            return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
         }
 
         // find existing AB
@@ -190,7 +204,7 @@ class AvailableBudgetController extends Controller
         if (null === $existing) {
             $this->abRepository->store(
                 [
-                    'amount'   => $request->get('amount'),
+                    'amount'   => $amount,
                     'currency' => $currency,
                     'start'    => $start,
                     'end'      => $end,
@@ -199,7 +213,7 @@ class AvailableBudgetController extends Controller
         }
         if (null !== $existing) {
             // update amount:
-            $this->abRepository->update($existing, ['amount' => $request->get('amount')]);
+            $this->abRepository->update($existing, ['amount' => $amount]);
         }
         session()->flash('success', trans('firefly.set_ab'));
 
@@ -217,7 +231,21 @@ class AvailableBudgetController extends Controller
      */
     public function update(Request $request, AvailableBudget $availableBudget, Carbon $start, Carbon $end)
     {
-        $this->abRepository->update($availableBudget, ['amount' => $request->get('amount')]);
+        // validate amount
+        $amount = (string) $request->get('amount');
+        if ('' === $amount) {
+            session()->flash('error', trans('firefly.invalid_amount'));
+
+            return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+        }
+        if (0 === bccomp('0', $amount)) {
+            session()->flash('error', trans('firefly.invalid_amount'));
+
+            return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+        }
+
+
+        $this->abRepository->update($availableBudget, ['amount' => $amount]);
         session()->flash('success', trans('firefly.updated_ab'));
 
         return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
diff --git a/resources/views/v1/budgets/available-budgets/create-alternative.twig b/resources/views/v1/budgets/available-budgets/create-alternative.twig
index eb76aa2e2b..d212385217 100644
--- a/resources/views/v1/budgets/available-budgets/create-alternative.twig
+++ b/resources/views/v1/budgets/available-budgets/create-alternative.twig
@@ -24,7 +24,7 @@
                     </select>
                 </div>
                 <div class="form-group">
-                    <input step="any" class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
+                    <input step="any" required class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
                 </div>
             </div>
             <div class="modal-footer">
diff --git a/resources/views/v1/budgets/available-budgets/create.twig b/resources/views/v1/budgets/available-budgets/create.twig
index 525099a349..9a77295ea4 100644
--- a/resources/views/v1/budgets/available-budgets/create.twig
+++ b/resources/views/v1/budgets/available-budgets/create.twig
@@ -24,7 +24,7 @@
 
                 <div class="input-group">
                     <div class="input-group-addon">{{ currency.symbol|raw }}</div>
-                    <input step="any" class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
+                    <input step="any" required class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
                 </div>
             </div>
             <div class="modal-footer">
diff --git a/resources/views/v1/budgets/available-budgets/edit.twig b/resources/views/v1/budgets/available-budgets/edit.twig
index cbad29b1a7..bdb04fc34b 100644
--- a/resources/views/v1/budgets/available-budgets/edit.twig
+++ b/resources/views/v1/budgets/available-budgets/edit.twig
@@ -20,7 +20,7 @@
 
                 <div class="input-group">
                     <div class="input-group-addon">{{ availableBudget.transactionCurrency.symbol|raw }}</div>
-                    <input step="any" class="form-control" id="amount" value="{{ availableBudget.amount }}" autocomplete="off" name="amount" type="number"/>
+                    <input step="any" required class="form-control" id="amount" value="{{ availableBudget.amount }}" autocomplete="off" name="amount" type="number"/>
                 </div>
             </div>
             <div class="modal-footer">