diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 884606716..3b12adf59 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -47,6 +47,7 @@ class LoginController extends Controller
     public function __construct()
     {
         $this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]);
+        Session::put('backUrl', URL::previous());
     }
 
 
@@ -320,4 +321,9 @@ class LoginController extends Controller
         return redirect()->route('login');
     }
 
+    public function redirectTo()
+    {
+        return Session::get('backUrl') ? Session::get('backUrl') :   $this->redirectTo;
+    }
+
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index b305ef94e..fb6323815 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -25,7 +25,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\CheckForSetup::class,
         \Fideloper\Proxy\TrustProxies::class,
         \App\Http\Middleware\CheckForDebug::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+       // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**
diff --git a/config/app.php b/config/app.php
index 43f851abd..6c9c471a5 100755
--- a/config/app.php
+++ b/config/app.php
@@ -167,7 +167,7 @@ return [
     |
     */
 
-    'referrer_policy' => env('REFERRER_POLICY', 'strict-origin'),
+    'referrer_policy' => env('REFERRER_POLICY', 'same-origin'),
 
     /*
     |--------------------------------------------------------------------------