diff --git a/app/Http/Middleware/DatabaseLookup.php b/app/Http/Middleware/DatabaseLookup.php
index 61143982967b..27f2d648300a 100644
--- a/app/Http/Middleware/DatabaseLookup.php
+++ b/app/Http/Middleware/DatabaseLookup.php
@@ -23,13 +23,11 @@ class DatabaseLookup
             if ($code = $request->confirmation_code) {
                 LookupUser::setServerByField('confirmation_code', $code);
             } elseif (session(SESSION_DB_SERVER)) {
-                /*
                 if (Auth::viaRemember()) {
                     Auth::logout();
                 } else {
                     // do nothing
                 }
-                */
             } elseif (! Auth::check() && $email = $request->email) {
                 LookupUser::setServerByField('email', $email);
             } else {
diff --git a/tests/acceptance/TaskCest.php b/tests/acceptance/TaskCest.php
index 79e810748241..e3c9bebbd6fa 100644
--- a/tests/acceptance/TaskCest.php
+++ b/tests/acceptance/TaskCest.php
@@ -55,6 +55,7 @@ class TaskCest
         $I->click('Invoice Task');
         $I->click('Mark Sent');
         $I->see('Sent');
+        $I->wait(1);
         $I->see('Successfully created invoice');
     }