diff --git a/src/Forum/Controller/LogInController.php b/src/Forum/Controller/LogInController.php
index f131150f9..8fc2fd879 100644
--- a/src/Forum/Controller/LogInController.php
+++ b/src/Forum/Controller/LogInController.php
@@ -81,7 +81,9 @@ class LogInController implements ControllerInterface
 
             event(new UserLoggedIn($this->users->findOrFail($data->userId), $token));
 
-            $response = $this->rememberer->remember($response, $token, ! array_get($body, 'remember'));
+            if (array_get($body, 'remember')) {
+                $response = $this->rememberer->remember($response, $token);
+            }
         }
 
         return $response;
diff --git a/src/Http/Rememberer.php b/src/Http/Rememberer.php
index d331d796c..697cfe243 100644
--- a/src/Http/Rememberer.php
+++ b/src/Http/Rememberer.php
@@ -24,7 +24,6 @@ class Rememberer
     protected $cookie;
 
     /**
-     * Rememberer constructor.
      * @param CookieFactory $cookie
      */
     public function __construct(CookieFactory $cookie)
@@ -32,18 +31,16 @@ class Rememberer
         $this->cookie = $cookie;
     }
 
-    public function remember(ResponseInterface $response, AccessToken $token, $session = false)
+    public function remember(ResponseInterface $response, AccessToken $token)
     {
         $lifetime = null;
 
-        if (! $session) {
-            $token->lifetime = $lifetime = 5 * 365 * 24 * 60 * 60; // 5 years
-            $token->save();
-        }
+        $token->lifetime = 5 * 365 * 24 * 60 * 60; // 5 years
+        $token->save();
 
         return FigResponseCookies::set(
             $response,
-            $this->cookie->make(self::COOKIE_NAME, $token->id, $lifetime)
+            $this->cookie->make(self::COOKIE_NAME, $token->id, $token->lifetime)
         );
     }