diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index e5812d513c..0cecc0a6ab 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -196,7 +196,7 @@ class AccountController extends Controller
         Session::flash('success', 'New account "' . $account->name . '" stored!');
 
         if (intval(Input::get('create_another')) === 1) {
-            return Redirect::route('accounts.create', $request->input('what'));
+            return Redirect::route('accounts.create', $request->input('what'))->withInput();
         }
 
         return Redirect::route('accounts.index', $request->input('what'));
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 93afee239e..38de9570bd 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -152,6 +152,12 @@ class BudgetController extends Controller
         return Redirect::route('budgets.index');
     }
 
+    /**
+     * @param BudgetFormRequest         $request
+     * @param BudgetRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
     public function store(BudgetFormRequest $request, BudgetRepositoryInterface $repository)
     {
         $budgetData = [
@@ -204,6 +210,10 @@ class BudgetController extends Controller
 
         Session::flash('success', 'Budget "' . $budget->name . '" updated.');
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('budgets.edit', $budget->id);
+        }
+
         return Redirect::route('budgets.index');
 
     }
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 766ddc2470..4fec077136 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -156,7 +156,7 @@ class CategoryController extends Controller
         Session::flash('success', 'New category "' . $category->name . '" stored!');
         
         if (intval(Input::get('create_another')) === 1) {
-            return Redirect::route('categories.create');
+            return Redirect::route('categories.create')->withInput();
         }
 
         return Redirect::route('categories.index');
@@ -181,6 +181,10 @@ class CategoryController extends Controller
 
         Session::flash('success', 'Category "' . $category->name . '" updated.');
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('categories.edit', $category->id);
+        }
+
         return Redirect::route('categories.index');
 
     }
diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php
index 50e58ef418..9fed87a44b 100644
--- a/app/Http/Controllers/CurrencyController.php
+++ b/app/Http/Controllers/CurrencyController.php
@@ -148,7 +148,7 @@ class CurrencyController extends Controller
         Session::flash('success', 'Currency "' . $currency->name . '" created');
 
         if (intval(Input::get('create_another')) === 1) {
-            return Redirect::route('currency.create');
+            return Redirect::route('currency.create')->withInput();
         }
 
         return Redirect::route('currency.index');
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index edfcaa5fb6..c80fa70c28 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -291,7 +291,10 @@ class PiggyBankController extends Controller
     }
 
     /**
+     * @param PiggyBankFormRequest         $request
+     * @param PiggyBankRepositoryInterface $repository
      *
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
     {
diff --git a/app/Http/Controllers/RepeatedExpenseController.php b/app/Http/Controllers/RepeatedExpenseController.php
index 85bc37d1c1..df3d920f10 100644
--- a/app/Http/Controllers/RepeatedExpenseController.php
+++ b/app/Http/Controllers/RepeatedExpenseController.php
@@ -12,6 +12,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Redirect;
 use Session;
 use View;
+use Input;
 
 /**
  * Class RepeatedExpenseController
@@ -144,7 +145,10 @@ class RepeatedExpenseController extends Controller
     }
 
     /**
-     * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
+     * @param PiggyBankFormRequest         $request
+     * @param PiggyBankRepositoryInterface $repository
+     *
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(PiggyBankFormRequest $request, PiggyBankRepositoryInterface $repository)
     {
@@ -167,6 +171,11 @@ class RepeatedExpenseController extends Controller
 
         Session::flash('success', 'Stored repeated expense "' . e($piggyBank->name) . '".');
 
+        if (intval(Input::get('create_another')) === 1) {
+            return Redirect::route('repeated.create', $request->input('what'))->withInput();
+        }
+
+
         return Redirect::route('repeated.index');
     }
 
@@ -195,6 +204,10 @@ class RepeatedExpenseController extends Controller
 
         $piggyBank = $repository->update($repeatedExpense, $piggyBankData);
 
+        if (intval(Input::get('return_to_edit')) === 1) {
+            return Redirect::route('repeated.edit', $piggyBank->id);
+        }
+
         Session::flash('success', 'Updated repeated expense "' . e($piggyBank->name) . '".');
 
         return Redirect::route('repeated.index');
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 38d19809d6..800195e1ac 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -236,6 +236,12 @@ class TransactionController extends Controller
         );
     }
 
+    /**
+     * @param JournalFormRequest         $request
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse
+     */
     public function store(JournalFormRequest $request, JournalRepositoryInterface $repository)
     {
         $journalData = [