diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 4b043280fe..e018002bfc 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -26,7 +26,6 @@ class AccountController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth');
         parent::__construct();
         View::share('mainTitleIcon', 'fa-credit-card');
         View::share('title', trans('firefly.accounts'));
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 41602ea21a..5a750ac786 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -29,7 +29,6 @@ class AttachmentController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth');
         parent::__construct();
         View::share('mainTitleIcon', 'fa-paperclip');
         View::share('title', trans('firefly.attachments'));
diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index ed706b9315..ca59f0d256 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -24,7 +24,6 @@ class BillController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth');
         parent::__construct();
         View::share('title', trans('firefly.bills'));
         View::share('mainTitleIcon', 'fa-calendar-o');
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index badaf90906..144cd44693 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -30,7 +30,6 @@ class BudgetController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth');
         parent::__construct();
         View::share('title', trans('firefly.budgets'));
         View::share('mainTitleIcon', 'fa-tasks');
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 12b8272c75..d564789c21 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -29,7 +29,6 @@ class CategoryController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth');
         parent::__construct();
         View::share('title', trans('firefly.categories'));
         View::share('mainTitleIcon', 'fa-bar-chart');
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index b4fcc1e54c..c8da84cf6b 100755
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -25,13 +25,30 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups
         = [
-            'web' => [
+            'web'            => [
                 \FireflyIII\Http\Middleware\EncryptCookies::class,
                 \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
                 \Illuminate\Session\Middleware\StartSession::class,
                 \Illuminate\View\Middleware\ShareErrorsFromSession::class,
                 \FireflyIII\Http\Middleware\VerifyCsrfToken::class,
             ],
+            'web-auth'       => [
+                \FireflyIII\Http\Middleware\EncryptCookies::class,
+                \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+                \Illuminate\Session\Middleware\StartSession::class,
+                \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+                \FireflyIII\Http\Middleware\VerifyCsrfToken::class,
+                \FireflyIII\Http\Middleware\Authenticate::class,
+            ],
+            'web-auth-range' => [
+                \FireflyIII\Http\Middleware\EncryptCookies::class,
+                \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+                \Illuminate\Session\Middleware\StartSession::class,
+                \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+                \FireflyIII\Http\Middleware\VerifyCsrfToken::class,
+                \FireflyIII\Http\Middleware\Authenticate::class,
+                \FireflyIII\Http\Middleware\Range::class,
+            ],
 
             'api' => [
                 'throttle:60,1',
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index ce0b27db58..72a2d567fe 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -6,12 +6,13 @@ namespace FireflyIII\Http\Middleware;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Navigation;
 use Preferences;
 use Session;
 use View;
 
+
 /**
  * Class SessionFilter
  *
@@ -41,14 +42,14 @@ class Range
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request $request
-     * @param  \Closure                 $theNext
+     * @param  \Closure                 $next
+     * @param  string|null              $guard
      *
      * @return mixed
      */
     public function handle($request, Closure $theNext, $guard = null)
     {
-        if ($this->auth->check()) {
-
+        if (!Auth::guard($guard)->guest()) {
             // ignore preference. set the range to be the current month:
             if (!Session::has('start') && !Session::has('end')) {
 
diff --git a/app/Http/routes.php b/app/Http/routes.php
index d334661479..d24da4a4de 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -271,7 +271,7 @@ Route::group(
 
 
 Route::group(
-    ['middleware' => ['range', 'web']], function () {
+    ['middleware' => ['web-auth-range']], function () {
 
     /**
      * Home Controller