From e8f6b9a143a71b18ef8edcab8b45767757a3af60 Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Wed, 24 Jun 2020 18:57:46 +0530
Subject: [PATCH] Issue #3314 fixed

---
 .../Controllers/ForgetPasswordController.php     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
index fc4b26b54..67c3a1971 100755
--- a/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
+++ b/packages/Webkul/User/src/Http/Controllers/ForgetPasswordController.php
@@ -32,8 +32,20 @@ class ForgetPasswordController extends Controller
      * @return \Illuminate\View\View
      */
     public function create()
-    {
-        return view($this->_config['view']);
+    {        
+        if (auth()->guard('admin')->check()) {
+            return redirect()->route('admin.dashboard.index');
+        } else {
+            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']);
+        }
     }
 
     /**