diff --git a/app/Http/Controllers/Import/ConfigurationController.php b/app/Http/Controllers/Import/ConfigurationController.php
index 0c4a6a574f..8450c26aab 100644
--- a/app/Http/Controllers/Import/ConfigurationController.php
+++ b/app/Http/Controllers/Import/ConfigurationController.php
@@ -55,6 +55,7 @@ class ConfigurationController extends Controller
                 return $next($request);
             }
         );
+        $this->middleware(IsDemoUser::class);
     }
 
     /**
diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php
index e8f3668660..4cb9e094cb 100644
--- a/app/Http/Controllers/Import/IndexController.php
+++ b/app/Http/Controllers/Import/IndexController.php
@@ -33,6 +33,7 @@ use Log;
 use Response;
 use View;
 
+
 /**
  * Class FileController.
  */
@@ -57,6 +58,7 @@ class IndexController extends Controller
                 return $next($request);
             }
         );
+        $this->middleware(IsDemoUser::class)->except(['index']);
     }
 
     /**
diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php
index ced50ba6cf..42a7b3d243 100644
--- a/app/Http/Controllers/Import/PrerequisitesController.php
+++ b/app/Http/Controllers/Import/PrerequisitesController.php
@@ -50,6 +50,7 @@ class PrerequisitesController extends Controller
                 return $next($request);
             }
         );
+        $this->middleware(IsDemoUser::class);
     }
 
     /**
diff --git a/app/Http/Controllers/Import/StatusController.php b/app/Http/Controllers/Import/StatusController.php
index 79b630194c..d5eb0a0165 100644
--- a/app/Http/Controllers/Import/StatusController.php
+++ b/app/Http/Controllers/Import/StatusController.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Import;
 
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Response;
@@ -47,6 +48,7 @@ class StatusController extends Controller
                 return $next($request);
             }
         );
+        $this->middleware(IsDemoUser::class);
     }
 
     /**
@@ -100,8 +102,10 @@ class StatusController extends Controller
                 /** @var TagRepositoryInterface $repository */
                 $repository             = app(TagRepositoryInterface::class);
                 $tag                    = $repository->find($tagId);
-                $count = $tag->transactionJournals()->count();
-                $result['finishedText'] = trans('import.status_finished_job', ['count' => $count,'link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]);
+                $count                  = $tag->transactionJournals()->count();
+                $result['finishedText'] = trans(
+                    'import.status_finished_job', ['count' => $count, 'link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag]
+                );
             }
 
             if ($tagId === 0) {
diff --git a/app/Http/Middleware/IsDemoUser.php b/app/Http/Middleware/IsDemoUser.php
index fe5e7f86c1..c4b1b5123f 100644
--- a/app/Http/Middleware/IsDemoUser.php
+++ b/app/Http/Middleware/IsDemoUser.php
@@ -51,9 +51,9 @@ class IsDemoUser
         /** @var User $user */
         $user = auth()->user();
         if ($user->hasRole('demo')) {
-            Session::flash('warning', strval(trans('firefly.not_available_demo_user')));
+            Session::flash('info', strval(trans('firefly.not_available_demo_user')));
 
-            return redirect(route('index'));
+            return redirect($request->session()->previousUrl());
         }
 
         return $next($request);