diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 223194b8..eabbc725 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -50,7 +50,8 @@ class Handler extends ExceptionHandler
             }
         });
         $this->renderable(function (PassportAuthenticationException $e) {
-            return response()->redirectTo(getSchemeAndHttpHost() . "/login.php");
+            $request = request();
+            return response()->redirectTo(sprintf("%s/login.php?returnto=%s", $request->getSchemeAndHttpHost(), urlencode($request->fullUrl())));
         });
 
         //Other Only handle in json request
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 406f179b..c1d28fc2 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -15,7 +15,7 @@ class Authenticate extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return getBaseUrl() . '/login.php';
+            return sprintf("%s/login.php?returnto=%s", $request->getSchemeAndHttpHost(), urlencode($request->fullUrl()));
         }
     }
 }
diff --git a/app/Http/Middleware/NexusAuth.php b/app/Http/Middleware/NexusAuth.php
index 9f68d9fb..a6e9a6cd 100644
--- a/app/Http/Middleware/NexusAuth.php
+++ b/app/Http/Middleware/NexusAuth.php
@@ -15,7 +15,7 @@ class NexusAuth extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return getBaseUrl() . '/login.php';
+            return sprintf("%s/login.php?returnto=%s", $request->getSchemeAndHttpHost(), urlencode($request->fullUrl()));
         }
     }
 }