diff --git a/app/Http/Controllers/Auth/Login.php b/app/Http/Controllers/Auth/Login.php
index 350a78518..5e659e155 100644
--- a/app/Http/Controllers/Auth/Login.php
+++ b/app/Http/Controllers/Auth/Login.php
@@ -112,7 +112,7 @@ class Login extends Controller
             'error' => false,
             'message' => null,
             'data' => null,
-            'redirect' => redirect()->intended('wizard')->getTargetUrl(),
+            'redirect' => redirect()->intended()->getTargetUrl(),
         ];
 
         return response()->json($response);
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 87c573910..697ceeae1 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -63,7 +63,7 @@ class Kernel extends HttpKernel
 
         'common' => [
             'web',
-            'wizard.completed',
+            'wizard.redirect',
         ],
 
         'guest' => [
@@ -75,7 +75,7 @@ class Kernel extends HttpKernel
             'web',
             'auth',
             'auth.disabled',
-            'wizard.completed',
+            'wizard.redirect',
             'menu.admin',
             'permission:read-admin-panel',
         ],
@@ -151,7 +151,7 @@ class Kernel extends HttpKernel
         'install.can' => \App\Http\Middleware\CanInstall::class,
         'install.redirect' => \App\Http\Middleware\RedirectIfNotInstalled::class,
         'money' => \App\Http\Middleware\Money::class,
-        'wizard.completed' => \App\Http\Middleware\RedirectIfWizardCompleted::class,
+        'wizard.redirect' => \App\Http\Middleware\RedirectIfWizardNotCompleted::class,
         'api.key' => \App\Http\Middleware\CanApiKey::class,
 
         // Vendor
diff --git a/app/Http/Middleware/RedirectIfWizardCompleted.php b/app/Http/Middleware/RedirectIfWizardNotCompleted.php
similarity index 75%
rename from app/Http/Middleware/RedirectIfWizardCompleted.php
rename to app/Http/Middleware/RedirectIfWizardNotCompleted.php
index bff53a70a..210f17e15 100644
--- a/app/Http/Middleware/RedirectIfWizardCompleted.php
+++ b/app/Http/Middleware/RedirectIfWizardNotCompleted.php
@@ -1,12 +1,12 @@
 <?php
+
 namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Str;
 
-class RedirectIfWizardCompleted
+class RedirectIfWizardNotCompleted
 {
-    
     /**
      * Handle an incoming request.
      *
@@ -16,17 +16,17 @@ class RedirectIfWizardCompleted
      */
     public function handle($request, Closure $next)
     {
-        // Check wizard is completed or not
+        // Check setting
         if (setting('wizard.completed', 0) == 1) {
             return $next($request);
         }
-        
-        // Already in the wizard
+
+        // Check url
         if (Str::startsWith($request->getPathInfo(), '/wizard')) {
             return $next($request);
         }
-        
-        // Not wizard completed, redirect to wizard
+
+        // Redirect to wizard
         redirect()->route('wizard.edit')->send();
     }
 }