diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index b699e3907fcc..27f2d648300a 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -23,7 +23,11 @@ class DatabaseLookup
             if ($code = $request->confirmation_code) {
                 LookupUser::setServerByField('confirmation_code', $code);
             } elseif (session(SESSION_DB_SERVER)) {
-                // do nothing
+                if (Auth::viaRemember()) {
+                    Auth::logout();
+                } else {
+                    // do nothing
+                }
             } elseif (! Auth::check() && $email = $request->email) {
                 LookupUser::setServerByField('email', $email);
             } else {
diff --git a/config/session.php b/config/session.php
index 9a432a212ae0..beb02c87d793 100644
--- a/config/session.php
+++ b/config/session.php
@@ -31,7 +31,7 @@ return [
 
 	'lifetime' => env('SESSION_LIFETIME', (60 * 8)),
 
-	'expire_on_close' => false,
+	'expire_on_close' => true,
 
 	/*
 	|--------------------------------------------------------------------------