diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 5144843bf7..5f86d60a57 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -62,8 +62,8 @@ class UserEventHandler
     public function logoutUser(): bool
     {
         // dump stuff from the session:
-        Session::forget('twofactor-authenticated');
-        Session::forget('twofactor-authenticated-date');
+        Session::forget('twoFactorAuthenticated');
+        Session::forget('twoFactorAuthenticatedDate');
 
         return true;
     }
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 47febc0f84..2c12693bcd 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -31,7 +31,6 @@ use Illuminate\Support\Collection;
 use Log;
 use Navigation;
 use Preferences;
-use Session;
 use Steam;
 use View;
 
@@ -61,11 +60,12 @@ class AccountController extends Controller
     }
 
     /**
-     * @param string $what
+     * @param Request $request
+     * @param string  $what
      *
-     * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|View
+     * @return View
      */
-    public function create(string $what = 'asset')
+    public function create(Request $request, string $what = 'asset')
     {
         /** @var CurrencyRepositoryInterface $repository */
         $repository      = app(CurrencyRepositoryInterface::class);
@@ -80,27 +80,28 @@ class AccountController extends Controller
 
 
         // pre fill some data
-        Session::flash('preFilled', ['currency_id' => $defaultCurrency->id,]);
+        $request->session()->flash('preFilled', ['currency_id' => $defaultCurrency->id,]);
 
         // put previous url in session if not redirect from store (not "create another").
         if (session('accounts.create.fromStore') !== true) {
             $this->rememberPreviousUri('accounts.create.uri');
         }
-        Session::forget('accounts.create.fromStore');
-        Session::flash('gaEventCategory', 'accounts');
-        Session::flash('gaEventAction', 'create-' . $what);
+        $request->session()->forget('accounts.create.fromStore');
+        $request->session()->flash('gaEventCategory', 'accounts');
+        $request->session()->flash('gaEventAction', 'create-' . $what);
 
         return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencies', 'roles'));
 
     }
 
     /**
+     * @param Request                    $request
      * @param AccountRepositoryInterface $repository
      * @param Account                    $account
      *
      * @return View
      */
-    public function delete(AccountRepositoryInterface $repository, Account $account)
+    public function delete(Request $request, AccountRepositoryInterface $repository, Account $account)
     {
         $typeName    = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $subTitle    = trans('firefly.delete_' . $typeName . '_account', ['name' => $account->name]);
@@ -109,8 +110,8 @@ class AccountController extends Controller
 
         // put previous url in session
         $this->rememberPreviousUri('accounts.delete.uri');
-        Session::flash('gaEventCategory', 'accounts');
-        Session::flash('gaEventAction', 'delete-' . $typeName);
+        $request->session()->flash('gaEventCategory', 'accounts');
+        $request->session()->flash('gaEventAction', 'delete-' . $typeName);
 
         return view('accounts.delete', compact('account', 'subTitle', 'accountList'));
     }
@@ -131,18 +132,19 @@ class AccountController extends Controller
 
         $repository->destroy($account, $moveTo);
 
-        Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name])));
+        $request->session()->flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name])));
         Preferences::mark();
 
         return redirect($this->getPreviousUri('accounts.delete.uri'));
     }
 
     /**
+     * @param Request $request
      * @param Account $account
      *
      * @return View
      */
-    public function edit(Account $account)
+    public function edit(Request $request, Account $account)
     {
 
         $what         = config('firefly.shortNamesByFullName')[$account->accountType->type];
@@ -161,7 +163,7 @@ class AccountController extends Controller
         if (session('accounts.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('accounts.edit.uri');
         }
-        Session::forget('accounts.edit.fromUpdate');
+        $request->session()->forget('accounts.edit.fromUpdate');
 
         // pre fill some useful values.
 
@@ -182,9 +184,9 @@ class AccountController extends Controller
             'virtualBalance'       => $account->virtual_balance,
             'currency_id'          => $account->getMeta('currency_id'),
         ];
-        Session::flash('preFilled', $preFilled);
-        Session::flash('gaEventCategory', 'accounts');
-        Session::flash('gaEventAction', 'edit-' . $what);
+        $request->session()->flash('preFilled', $preFilled);
+        $request->session()->flash('gaEventCategory', 'accounts');
+        $request->session()->flash('gaEventAction', 'edit-' . $what);
 
         return view('accounts.edit', compact('currencies', 'account', 'subTitle', 'subTitleIcon', 'openingBalance', 'what', 'roles'));
     }
@@ -334,7 +336,7 @@ class AccountController extends Controller
         $data    = $request->getAccountData();
         $account = $repository->store($data);
 
-        Session::flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name])));
+        $request->session()->flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name])));
         Preferences::mark();
 
         // update preferences if necessary:
@@ -346,7 +348,7 @@ class AccountController extends Controller
 
         if (intval($request->get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
-            Session::put('accounts.create.fromStore', true);
+            $request->session()->put('accounts.create.fromStore', true);
 
             return redirect(route('accounts.create', [$request->input('what')]))->withInput();
         }
@@ -367,12 +369,12 @@ class AccountController extends Controller
         $data = $request->getAccountData();
         $repository->update($account, $data);
 
-        Session::flash('success', strval(trans('firefly.updated_account', ['name' => $account->name])));
+        $request->session()->flash('success', strval(trans('firefly.updated_account', ['name' => $account->name])));
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
-            Session::put('accounts.edit.fromUpdate', true);
+            $request->session()->put('accounts.edit.fromUpdate', true);
 
             return redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]);
         }
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index a6532309f1..51b24e4d93 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -18,10 +18,10 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Requests\AttachmentFormRequest;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Preferences;
 use Response;
-use Session;
 use View;
 
 /**
@@ -53,35 +53,37 @@ class AttachmentController extends Controller
     }
 
     /**
+     * @param Request    $request
      * @param Attachment $attachment
      *
      * @return View
      */
-    public function delete(Attachment $attachment)
+    public function delete(Request $request, Attachment $attachment)
     {
         $subTitle = trans('firefly.delete_attachment', ['name' => $attachment->filename]);
 
         // put previous url in session
         $this->rememberPreviousUri('attachments.delete.uri');
-        Session::flash('gaEventCategory', 'attachments');
-        Session::flash('gaEventAction', 'delete-attachment');
+        $request->session()->flash('gaEventCategory', 'attachments');
+        $request->session()->flash('gaEventAction', 'delete-attachment');
 
         return view('attachments.delete', compact('attachment', 'subTitle'));
     }
 
     /**
+     * @param Request                       $request
      * @param AttachmentRepositoryInterface $repository
      * @param Attachment                    $attachment
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(AttachmentRepositoryInterface $repository, Attachment $attachment)
+    public function destroy(Request $request, AttachmentRepositoryInterface $repository, Attachment $attachment)
     {
         $name = $attachment->filename;
 
         $repository->destroy($attachment);
 
-        Session::flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name])));
+        $request->session()->flash('success', strval(trans('firefly.attachment_deleted', ['name' => $name])));
         Preferences::mark();
 
         return redirect($this->getPreviousUri('attachments.delete.uri'));
@@ -119,11 +121,12 @@ class AttachmentController extends Controller
     }
 
     /**
+     * @param Request    $request
      * @param Attachment $attachment
      *
      * @return View
      */
-    public function edit(Attachment $attachment)
+    public function edit(Request $request, Attachment $attachment)
     {
         $subTitleIcon = 'fa-pencil';
         $subTitle     = trans('firefly.edit_attachment', ['name' => $attachment->filename]);
@@ -132,7 +135,7 @@ class AttachmentController extends Controller
         if (session('attachments.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('attachments.edit.uri');
         }
-        Session::forget('attachments.edit.fromUpdate');
+        $request->session()->forget('attachments.edit.fromUpdate');
 
         return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
     }
@@ -169,12 +172,12 @@ class AttachmentController extends Controller
         $data = $request->getAttachmentData();
         $repository->update($attachment, $data);
 
-        Session::flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename])));
+        $request->session()->flash('success', strval(trans('firefly.attachment_updated', ['name' => $attachment->filename])));
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
-            Session::put('attachments.edit.fromUpdate', true);
+            $request->session()->put('attachments.edit.fromUpdate', true);
 
             return redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]);
         }
diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php
index bf3b425161..66df10f66e 100644
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -86,8 +86,8 @@ class TwoFactorController extends Controller
      */
     public function postIndex(TokenFormRequest $request)
     {
-        Session::put('twofactor-authenticated', true);
-        Session::put('twofactor-authenticated-date', new Carbon);
+        Session::put('twoFactorAuthenticated', true);
+        Session::put('twoFactorAuthenticatedDate', new Carbon);
 
         return redirect(route('home'));
     }
diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index ae95ba23ef..b05ede6e52 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -22,7 +22,6 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Preferences;
-use Session;
 use URL;
 use View;
 
@@ -53,9 +52,11 @@ class BillController extends Controller
     }
 
     /**
+     * @param Request $request
+     *
      * @return View
      */
-    public function create()
+    public function create(Request $request)
     {
         $periods = [];
         foreach (config('firefly.bill_periods') as $current) {
@@ -68,52 +69,55 @@ class BillController extends Controller
         if (session('bills.create.fromStore') !== true) {
             $this->rememberPreviousUri('bills.create.uri');
         }
-        Session::forget('bills.create.fromStore');
-        Session::flash('gaEventCategory', 'bills');
-        Session::flash('gaEventAction', 'create');
+        $request->session()->forget('bills.create.fromStore');
+        $request->session()->flash('gaEventCategory', 'bills');
+        $request->session()->flash('gaEventAction', 'create');
 
         return view('bills.create', compact('periods', 'subTitle'));
     }
 
     /**
-     * @param Bill $bill
+     * @param Request $request
+     * @param Bill    $bill
      *
      * @return View
      */
-    public function delete(Bill $bill)
+    public function delete(Request $request, Bill $bill)
     {
         // put previous url in session
         $this->rememberPreviousUri('bills.delete.uri');
-        Session::flash('gaEventCategory', 'bills');
-        Session::flash('gaEventAction', 'delete');
+        $request->session()->flash('gaEventCategory', 'bills');
+        $request->session()->flash('gaEventAction', 'delete');
         $subTitle = trans('firefly.delete_bill', ['name' => $bill->name]);
 
         return view('bills.delete', compact('bill', 'subTitle'));
     }
 
     /**
+     * @param Request                 $request
      * @param BillRepositoryInterface $repository
      * @param Bill                    $bill
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(BillRepositoryInterface $repository, Bill $bill)
+    public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill)
     {
         $name = $bill->name;
         $repository->destroy($bill);
 
-        Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name])));
+        $request->session()->flash('success', strval(trans('firefly.deleted_bill', ['name' => $name])));
         Preferences::mark();
 
         return redirect($this->getPreviousUri('bills.delete.uri'));
     }
 
     /**
-     * @param Bill $bill
+     * @param Request $request
+     * @param Bill    $bill
      *
      * @return View
      */
-    public function edit(Bill $bill)
+    public function edit(Request $request, Bill $bill)
     {
         $periods = [];
         foreach (config('firefly.bill_periods') as $current) {
@@ -125,9 +129,9 @@ class BillController extends Controller
         if (session('bills.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('bills.edit.uri');
         }
-        Session::forget('bills.edit.fromUpdate');
-        Session::flash('gaEventCategory', 'bills');
-        Session::flash('gaEventAction', 'edit');
+        $request->session()->forget('bills.edit.fromUpdate');
+        $request->session()->flash('gaEventCategory', 'bills');
+        $request->session()->flash('gaEventAction', 'edit');
 
         return view('bills.edit', compact('subTitle', 'periods', 'bill'));
     }
@@ -163,15 +167,16 @@ class BillController extends Controller
     }
 
     /**
+     * @param Request                 $request
      * @param BillRepositoryInterface $repository
      * @param Bill                    $bill
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function rescan(BillRepositoryInterface $repository, Bill $bill)
+    public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill)
     {
         if (intval($bill->active) == 0) {
-            Session::flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));
+            $request->session()->flash('warning', strval(trans('firefly.cannot_scan_inactive_bill')));
 
             return redirect(URL::previous());
         }
@@ -183,7 +188,7 @@ class BillController extends Controller
         }
 
 
-        Session::flash('success', strval(trans('firefly.rescanned_bill')));
+        $request->session()->flash('success', strval(trans('firefly.rescanned_bill')));
         Preferences::mark();
 
         return redirect(URL::previous());
@@ -231,12 +236,12 @@ class BillController extends Controller
     {
         $billData = $request->getBillData();
         $bill     = $repository->store($billData);
-        Session::flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)])));
+        $request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)])));
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
-            Session::put('bills.create.fromStore', true);
+            $request->session()->put('bills.create.fromStore', true);
 
             return redirect(route('bills.create'))->withInput();
         }
@@ -258,12 +263,12 @@ class BillController extends Controller
         $billData = $request->getBillData();
         $bill     = $repository->update($bill, $billData);
 
-        Session::flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)])));
+        $request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)])));
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
-            Session::put('bills.edit.fromUpdate', true);
+            $request->session()->put('bills.edit.fromUpdate', true);
 
             return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);
         }
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index f21bc904fa..c7c73030f7 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -29,7 +29,6 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Preferences;
 use Response;
-use Session;
 use View;
 
 /**
@@ -87,17 +86,19 @@ class BudgetController extends Controller
     }
 
     /**
+     * @param Request $request
+     *
      * @return View
      */
-    public function create()
+    public function create(Request $request)
     {
         // put previous url in session if not redirect from store (not "create another").
         if (session('budgets.create.fromStore') !== true) {
             $this->rememberPreviousUri('budgets.create.uri');
         }
-        Session::forget('budgets.create.fromStore');
-        Session::flash('gaEventCategory', 'budgets');
-        Session::flash('gaEventAction', 'create');
+        $request->session()->forget('budgets.create.fromStore');
+        $request->session()->flash('gaEventCategory', 'budgets');
+        $request->session()->flash('gaEventAction', 'create');
         $subTitle = (string)trans('firefly.create_new_budget');
 
         return view('budgets.create', compact('subTitle'));
@@ -108,40 +109,42 @@ class BudgetController extends Controller
      *
      * @return View
      */
-    public function delete(Budget $budget)
+    public function delete(Request $request, Budget $budget)
     {
         $subTitle = trans('firefly.delete_budget', ['name' => $budget->name]);
 
         // put previous url in session
         $this->rememberPreviousUri('budgets.delete.uri');
-        Session::flash('gaEventCategory', 'budgets');
-        Session::flash('gaEventAction', 'delete');
+        $request->session()->flash('gaEventCategory', 'budgets');
+        $request->session()->flash('gaEventAction', 'delete');
 
         return view('budgets.delete', compact('budget', 'subTitle'));
     }
 
     /**
-     * @param Budget $budget
+     * @param Request $request
+     * @param Budget  $budget
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(Budget $budget)
+    public function destroy(Request $request, Budget $budget)
     {
 
         $name = $budget->name;
         $this->repository->destroy($budget);
-        Session::flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)])));
+        $request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)])));
         Preferences::mark();
 
         return redirect($this->getPreviousUri('budgets.delete.uri'));
     }
 
     /**
-     * @param Budget $budget
+     * @param Request $request
+     * @param Budget  $budget
      *
      * @return View
      */
-    public function edit(Budget $budget)
+    public function edit(Request $request, Budget $budget)
     {
         $subTitle = trans('firefly.edit_budget', ['name' => $budget->name]);
 
@@ -149,9 +152,9 @@ class BudgetController extends Controller
         if (session('budgets.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('budgets.edit.uri');
         }
-        Session::forget('budgets.edit.fromUpdate');
-        Session::flash('gaEventCategory', 'budgets');
-        Session::flash('gaEventAction', 'edit');
+        $request->session()->forget('budgets.edit.fromUpdate');
+        $request->session()->flash('gaEventCategory', 'budgets');
+        $request->session()->flash('gaEventAction', 'edit');
 
         return view('budgets.edit', compact('budget', 'subTitle'));
 
@@ -305,12 +308,12 @@ class BudgetController extends Controller
         $data   = $request->getBudgetData();
         $budget = $this->repository->store($data);
 
-        Session::flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)])));
+        $request->session()->flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)])));
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
             // set value so create routine will not overwrite URL:
-            Session::put('budgets.create.fromStore', true);
+            $request->session()->put('budgets.create.fromStore', true);
 
             return redirect(route('budgets.create'))->withInput();
         }
@@ -329,12 +332,12 @@ class BudgetController extends Controller
         $data = $request->getBudgetData();
         $this->repository->update($budget, $data);
 
-        Session::flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)])));
+        $request->session()->flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)])));
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
             // set value so edit routine will not overwrite URL:
-            Session::put('budgets.edit.fromUpdate', true);
+            $request->session()->put('budgets.edit.fromUpdate', true);
 
             return redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]);
         }
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 2224cb3512..24a391ec4b 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -25,7 +25,6 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
-use Session;
 use View;
 
 /**
@@ -55,63 +54,68 @@ class CategoryController extends Controller
     }
 
     /**
+     * @param Request $request
+     *
      * @return View
      */
-    public function create()
+    public function create(Request $request)
     {
         if (session('categories.create.fromStore') !== true) {
             $this->rememberPreviousUri('categories.create.uri');
         }
-        Session::forget('categories.create.fromStore');
-        Session::flash('gaEventCategory', 'categories');
-        Session::flash('gaEventAction', 'create');
+        $request->session()->forget('categories.create.fromStore');
+        $request->session()->flash('gaEventCategory', 'categories');
+        $request->session()->flash('gaEventAction', 'create');
         $subTitle = trans('firefly.create_new_category');
 
         return view('categories.create', compact('subTitle'));
     }
 
     /**
+     * @param Request  $request
      * @param Category $category
      *
      * @return View
      */
-    public function delete(Category $category)
+    public function delete(Request $request, Category $category)
     {
         $subTitle = trans('firefly.delete_category', ['name' => $category->name]);
 
         // put previous url in session
         $this->rememberPreviousUri('categories.delete.uri');
-        Session::flash('gaEventCategory', 'categories');
-        Session::flash('gaEventAction', 'delete');
+        $request->session()->flash('gaEventCategory', 'categories');
+        $request->session()->flash('gaEventAction', 'delete');
 
         return view('categories.delete', compact('category', 'subTitle'));
     }
 
 
     /**
+     * @param Request                     $request
      * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(CategoryRepositoryInterface $repository, Category $category)
+    public function destroy(Request $request, CategoryRepositoryInterface $repository, Category $category)
     {
 
         $name = $category->name;
         $repository->destroy($category);
 
-        Session::flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)])));
+        $request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)])));
         Preferences::mark();
 
         return redirect($this->getPreviousUri('categories.delete.uri'));
     }
 
     /**
+     * @param Request  $request
      * @param Category $category
      *
      * @return View
      */
-    public function edit(Category $category)
+    public function edit(Request $request, Category $category)
     {
         $subTitle = trans('firefly.edit_category', ['name' => $category->name]);
 
@@ -119,9 +123,9 @@ class CategoryController extends Controller
         if (session('categories.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('categories.edit.uri');
         }
-        Session::forget('categories.edit.fromUpdate');
-        Session::flash('gaEventCategory', 'categories');
-        Session::flash('gaEventAction', 'edit');
+        $request->session()->forget('categories.edit.fromUpdate');
+        $request->session()->flash('gaEventCategory', 'categories');
+        $request->session()->flash('gaEventAction', 'edit');
 
         return view('categories.edit', compact('category', 'subTitle'));
 
@@ -269,11 +273,11 @@ class CategoryController extends Controller
         $data     = $request->getCategoryData();
         $category = $repository->store($data);
 
-        Session::flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)])));
+        $request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)])));
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
-            Session::put('categories.create.fromStore', true);
+            $request->session()->put('categories.create.fromStore', true);
 
             return redirect(route('categories.create'))->withInput();
         }
@@ -294,11 +298,11 @@ class CategoryController extends Controller
         $data = $request->getCategoryData();
         $repository->update($category, $data);
 
-        Session::flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)])));
+        $request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)])));
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
-            Session::put('categories.edit.fromUpdate', true);
+            $request->session()->put('categories.edit.fromUpdate', true);
 
             return redirect(route('categories.edit', [$category->id]));
         }
diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php
index 01cb6abd3e..d38e964c62 100644
--- a/app/Http/Controllers/CurrencyController.php
+++ b/app/Http/Controllers/CurrencyController.php
@@ -17,9 +17,9 @@ use Cache;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use Illuminate\Http\Request;
 use Log;
 use Preferences;
-use Session;
 use View;
 
 /**
@@ -52,7 +52,7 @@ class CurrencyController extends Controller
     /**
      * @return View
      */
-    public function create()
+    public function create(Request $request)
     {
         $subTitleIcon = 'fa-plus';
         $subTitle     = trans('firefly.create_currency');
@@ -61,25 +61,26 @@ class CurrencyController extends Controller
         if (session('currencies.create.fromStore') !== true) {
             $this->rememberPreviousUri('currencies.create.uri');
         }
-        Session::forget('currencies.create.fromStore');
-        Session::flash('gaEventCategory', 'currency');
-        Session::flash('gaEventAction', 'create');
+        $request->session()->forget('currencies.create.fromStore');
+        $request->session()->flash('gaEventCategory', 'currency');
+        $request->session()->flash('gaEventAction', 'create');
 
         return view('currencies.create', compact('subTitleIcon', 'subTitle'));
     }
 
     /**
+     * @param Request             $request
      * @param TransactionCurrency $currency
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function defaultCurrency(TransactionCurrency $currency)
+    public function defaultCurrency(Request $request, TransactionCurrency $currency)
     {
 
         Preferences::set('currencyPreference', $currency->code);
         Preferences::mark();
 
-        Session::flash('success', trans('firefly.new_default_currency', ['name' => $currency->name]));
+        $request->session()->flash('success', trans('firefly.new_default_currency', ['name' => $currency->name]));
         Cache::forget('FFCURRENCYSYMBOL');
         Cache::forget('FFCURRENCYCODE');
 
@@ -94,10 +95,10 @@ class CurrencyController extends Controller
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
-    public function delete(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
+    public function delete(Request $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
         if (!$repository->canDeleteCurrency($currency)) {
-            Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
+            $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
 
             return redirect(route('currencies.index'));
         }
@@ -105,8 +106,8 @@ class CurrencyController extends Controller
 
         // put previous url in session
         $this->rememberPreviousUri('currencies.delete.uri');
-        Session::flash('gaEventCategory', 'currency');
-        Session::flash('gaEventAction', 'delete');
+        $request->session()->flash('gaEventCategory', 'currency');
+        $request->session()->flash('gaEventAction', 'delete');
         $subTitle = trans('form.delete_currency', ['name' => $currency->name]);
 
 
@@ -119,26 +120,27 @@ class CurrencyController extends Controller
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
+    public function destroy(Request $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
         if (!$repository->canDeleteCurrency($currency)) {
-            Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
+            $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
 
             return redirect(route('currencies.index'));
         }
 
         $repository->destroy($currency);
-        Session::flash('success', trans('firefly.deleted_currency', ['name' => $currency->name]));
+        $request->session()->flash('success', trans('firefly.deleted_currency', ['name' => $currency->name]));
 
         return redirect($this->getPreviousUri('currencies.delete.uri'));
     }
 
     /**
+     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return View
      */
-    public function edit(TransactionCurrency $currency)
+    public function edit(Request $request, TransactionCurrency $currency)
     {
         $subTitleIcon     = 'fa-pencil';
         $subTitle         = trans('breadcrumbs.edit_currency', ['name' => $currency->name]);
@@ -148,27 +150,28 @@ class CurrencyController extends Controller
         if (session('currencies.edit.fromUpdate') !== true) {
             $this->rememberPreviousUri('currencies.edit.uri');
         }
-        Session::forget('currencies.edit.fromUpdate');
-        Session::flash('gaEventCategory', 'currency');
-        Session::flash('gaEventAction', 'edit');
+        $request->session()->forget('currencies.edit.fromUpdate');
+        $request->session()->flash('gaEventCategory', 'currency');
+        $request->session()->flash('gaEventAction', 'edit');
 
         return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
 
     }
 
     /**
+     * @param Request                     $request
      * @param CurrencyRepositoryInterface $repository
      *
      * @return View
      */
-    public function index(CurrencyRepositoryInterface $repository)
+    public function index(Request $request, CurrencyRepositoryInterface $repository)
     {
         $currencies      = $repository->get();
         $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR')));
 
 
         if (!auth()->user()->hasRole('owner')) {
-            Session::flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            $request->session()->flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
         }
 
 
@@ -192,10 +195,10 @@ class CurrencyController extends Controller
 
         $data     = $request->getCurrencyData();
         $currency = $repository->store($data);
-        Session::flash('success', trans('firefly.created_currency', ['name' => $currency->name]));
+        $request->session()->flash('success', trans('firefly.created_currency', ['name' => $currency->name]));
 
         if (intval($request->get('create_another')) === 1) {
-            Session::put('currencies.create.fromStore', true);
+            $request->session()->put('currencies.create.fromStore', true);
 
             return redirect(route('currencies.create'))->withInput();
         }
@@ -216,12 +219,12 @@ class CurrencyController extends Controller
         if (auth()->user()->hasRole('owner')) {
             $currency = $repository->update($currency, $data);
         }
-        Session::flash('success', trans('firefly.updated_currency', ['name' => $currency->name]));
+        $request->session()->flash('success', trans('firefly.updated_currency', ['name' => $currency->name]));
         Preferences::mark();
 
 
         if (intval($request->get('return_to_edit')) === 1) {
-            Session::put('currencies.edit.fromUpdate', true);
+            $request->session()->put('currencies.edit.fromUpdate', true);
 
             return redirect(route('currencies.edit', [$currency->id]));
         }
diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php
index 4a70121724..830c32eb78 100644
--- a/app/Http/Controllers/Transaction/SingleController.php
+++ b/app/Http/Controllers/Transaction/SingleController.php
@@ -190,7 +190,7 @@ class SingleController extends Controller
         if ($this->isOpeningBalance($transactionJournal)) {
             return $this->redirectToAccount($transactionJournal);
         }
-        $type      = TransactionJournal::transactionTypeStr($transactionJournal);
+        $type = TransactionJournal::transactionTypeStr($transactionJournal);
         Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)])));
 
         $repository->delete($transactionJournal);
diff --git a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
index 43cc865dc7..0b2894ef19 100644
--- a/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
@@ -40,7 +40,7 @@ class RedirectIfTwoFactorAuthenticated
 
             $is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
             $has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
-            $is2faAuthed  = Session::get('twofactor-authenticated');
+            $is2faAuthed  = Session::get('twoFactorAuthenticated');
             if ($is2faEnabled && $has2faSecret && $is2faAuthed) {
                 return redirect('/');
             }
diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php
index e413987334..404e2f9d2f 100644
--- a/app/Repositories/RuleGroup/RuleGroupRepository.php
+++ b/app/Repositories/RuleGroup/RuleGroupRepository.php
@@ -30,14 +30,6 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
     /** @var User */
     private $user;
 
-    /**
-     * @param User $user
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user;
-    }
-
     /**
      * @return int
      */
@@ -228,6 +220,14 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
 
     }
 
+    /**
+     * @param User $user
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+    }
+
     /**
      * @param array $data
      *