diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php
index 914ce2a12..0032c6a47 100755
--- a/packages/Webkul/User/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php
@@ -45,7 +45,14 @@ class SessionController extends Controller
         if (auth()->guard('admin')->check()) {
             return redirect()->route('admin.dashboard.index');
         } else {
-            session()->put('url.intended', url()->previous());
+            if (strpos(url()->previous(), 'admin') !== false) {
+                $intendedUrl = url()->previous();
+            } else {
+                $intendedUrl = route('admin.dashboard.index');
+            }
+
+            session()->put('url.intended', $intendedUrl);
+
             return view($this->_config['view']);
         }
     }