diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 518d9e74dd..3285892e53 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -89,14 +89,7 @@ class PiggyBankController extends Controller
         $savedSoFar    = $this->piggyRepos->getCurrentAmount($piggyBank);
         $leftToSave    = bcsub($piggyBank->targetamount, $savedSoFar);
         $maxAmount     = min($leftOnAccount, $leftToSave);
-
-        // get currency:
-        $currency   = app('amount')->getDefaultCurrency();
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
-        if ($currencyId > 0) {
-            $currency = $this->currencyRepos->findNull($currencyId);
-        }
+        $currency      = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
         return view('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
     }
@@ -116,14 +109,7 @@ class PiggyBankController extends Controller
         $savedSoFar    = $this->piggyRepos->getCurrentAmount($piggyBank);
         $leftToSave    = bcsub($piggyBank->targetamount, $savedSoFar);
         $maxAmount     = min($leftOnAccount, $leftToSave);
-
-        // get currency:
-        $currency   = app('amount')->getDefaultCurrency();
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
-        if ($currencyId > 0) {
-            $currency = $this->currencyRepos->findNull($currencyId);
-        }
+        $currency      = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
         return view('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
     }
@@ -292,12 +278,11 @@ class PiggyBankController extends Controller
      */
     public function postAdd(Request $request, PiggyBank $piggyBank): RedirectResponse
     {
-        $amount     = $request->get('amount') ?? '0';
-        $currency   = app('amount')->getDefaultCurrency();
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
-        if ($currencyId > 0) {
-            $currency = $this->currencyRepos->findNull($currencyId);
+        $amount   = $request->get('amount') ?? '0';
+        $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
+        // if amount is negative, make positive and continue:
+        if (-1 === bccomp($amount, '0')) {
+            $amount = bcmul($amount, '-1');
         }
         if ($this->piggyRepos->canAddAmount($piggyBank, $amount)) {
             $this->piggyRepos->addAmount($piggyBank, $amount);
@@ -335,12 +320,11 @@ class PiggyBankController extends Controller
      */
     public function postRemove(Request $request, PiggyBank $piggyBank): RedirectResponse
     {
-        $amount     = $request->get('amount') ?? '0';
-        $currency   = app('amount')->getDefaultCurrency();
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
-        if ($currencyId > 0) {
-            $currency = $this->currencyRepos->findNull($currencyId);
+        $amount   = $request->get('amount') ?? '0';
+        $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
+        // if amount is negative, make positive and continue:
+        if (-1 === bccomp($amount, '0')) {
+            $amount = bcmul($amount, '-1');
         }
         if ($this->piggyRepos->canRemoveAmount($piggyBank, $amount)) {
             $this->piggyRepos->removeAmount($piggyBank, $amount);
@@ -379,13 +363,7 @@ class PiggyBankController extends Controller
     public function remove(PiggyBank $piggyBank)
     {
         $repetition = $this->piggyRepos->getRepetition($piggyBank);
-        // get currency:
-        $currency   = app('amount')->getDefaultCurrency();
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
-        if ($currencyId > 0) {
-            $currency = $this->currencyRepos->findNull($currencyId);
-        }
+        $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
         return view('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
     }
@@ -400,14 +378,7 @@ class PiggyBankController extends Controller
     public function removeMobile(PiggyBank $piggyBank)
     {
         $repetition = $this->piggyRepos->getRepetition($piggyBank);
-        // get currency:
-        $currency   = app('amount')->getDefaultCurrency();
-        // TODO we can use getAccountCurrency() instead
-        $currencyId = (int)$this->accountRepos->getMetaValue($piggyBank->account, 'currency_id');
-        if ($currencyId > 0) {
-            $currency = $this->currencyRepos->findNull($currencyId);
-        }
-
+        $currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
         return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
     }