diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index d0a91320e1..ffa5b10fc2 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -33,6 +33,7 @@
 
 namespace OC\Core\Controller;
 
+use OC\Authentication\Token\IToken;
 use OC\Authentication\TwoFactorAuth\Manager;
 use OC\Security\Bruteforce\Throttler;
 use OC\User\Session;
@@ -137,11 +138,10 @@ class LoginController extends Controller {
 	 *
 	 * @param string $user
 	 * @param string $redirect_url
-	 * @param string $remember_login
 	 *
 	 * @return TemplateResponse|RedirectResponse
 	 */
-	public function showLoginForm($user, $redirect_url, $remember_login) {
+	public function showLoginForm($user, $redirect_url) {
 		if ($this->userSession->isLoggedIn()) {
 			return new RedirectResponse(OC_Util::getDefaultPageUrl());
 		}
@@ -184,8 +184,6 @@ class LoginController extends Controller {
 		}
 
 		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
-		$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
-		$parameters['hideRemeberLoginState'] = !empty($redirect_url) && $this->session->exists('client.flow.state.token');
 
 		if ($user !== null && $user !== '') {
 			$parameters['loginName'] = $user;
@@ -240,7 +238,7 @@ class LoginController extends Controller {
 	 * @param string $timezone_offset
 	 * @return RedirectResponse
 	 */
-	public function tryLogin($user, $password, $redirect_url, $remember_login = false, $timezone = '', $timezone_offset = '') {
+	public function tryLogin($user, $password, $redirect_url, $remember_login = true, $timezone = '', $timezone_offset = '') {
 		if(!is_string($user)) {
 			throw new \InvalidArgumentException('Username must be string');
 		}
@@ -288,7 +286,7 @@ class LoginController extends Controller {
 		// TODO: remove password checks from above and let the user session handle failures
 		// requires https://github.com/owncloud/core/pull/24616
 		$this->userSession->completeLogin($loginResult, ['loginName' => $user, 'password' => $password]);
-		$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, (int)$remember_login);
+		$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, IToken::REMEMBER);
 
 		// User has successfully logged in, now remove the password reset link, when it is available
 		$this->config->deleteUserValue($loginResult->getUID(), 'core', 'lostpassword');
diff --git a/core/templates/login.php b/core/templates/login.php
index 3633400b31..ee1ce6a687 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -76,16 +76,6 @@ script('core', 'merged-login');
 		<?php } ?>
 
 		<div class="login-additional">
-			<?php if (!$_['hideRemeberLoginState']) { ?>
-			<div class="remember-login-container">
-				<?php if ($_['rememberLoginState'] === 0) { ?>
-				<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
-				<?php } else { ?>
-				<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white" checked="checked">
-				<?php } ?>
-				<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
-			</div>
-			<?php } ?>
 			<?php if (!empty($_['canResetPassword'])) { ?>
 			<div class="lost-password-container">
 				<a id="lost-password" href="<?php p($_['resetPasswordLink']); ?>">
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index c0de180abb..ccd70111ae 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -21,6 +21,7 @@
 
 namespace Tests\Core\Controller;
 
+use OC\Authentication\Token\IToken;
 use OC\Authentication\TwoFactorAuth\Manager;
 use OC\Core\Controller\LoginController;
 use OC\Security\Bruteforce\Throttler;
@@ -193,9 +194,7 @@ class LoginControllerTest extends TestCase {
 				'user_autofocus' => true,
 				'canResetPassword' => true,
 				'alt_login' => [],
-				'rememberLoginState' => 0,
 				'resetPasswordLink' => null,
-				'hideRemeberLoginState' => false,
 				'throttle_delay' => 1000,
 			],
 			'guest'
@@ -208,11 +207,6 @@ class LoginControllerTest extends TestCase {
 			->expects($this->once())
 			->method('isLoggedIn')
 			->willReturn(false);
-		$this->session
-			->expects($this->once())
-			->method('exists')
-			->with('client.flow.state.token')
-			->willReturn(true);
 
 		$expectedResponse = new TemplateResponse(
 			'core',
@@ -224,9 +218,7 @@ class LoginControllerTest extends TestCase {
 				'user_autofocus' => true,
 				'canResetPassword' => true,
 				'alt_login' => [],
-				'rememberLoginState' => 0,
 				'resetPasswordLink' => null,
-				'hideRemeberLoginState' => true,
 				'throttle_delay' => 1000,
 			],
 			'guest'
@@ -284,9 +276,7 @@ class LoginControllerTest extends TestCase {
 				'user_autofocus' => false,
 				'canResetPassword' => $expectedResult,
 				'alt_login' => [],
-				'rememberLoginState' => 0,
 				'resetPasswordLink' => false,
-				'hideRemeberLoginState' => false,
 				'throttle_delay' => 1000,
 			],
 			'guest'
@@ -324,9 +314,7 @@ class LoginControllerTest extends TestCase {
 				'user_autofocus' => false,
 				'canResetPassword' => false,
 				'alt_login' => [],
-				'rememberLoginState' => 0,
 				'resetPasswordLink' => false,
-				'hideRemeberLoginState' => false,
 				'throttle_delay' => 1000,
 			],
 			'guest'
@@ -395,7 +383,7 @@ class LoginControllerTest extends TestCase {
 			->with($user, ['loginName' => $loginName, 'password' => $password]);
 		$this->userSession->expects($this->once())
 			->method('createSessionToken')
-			->with($this->request, $user->getUID(), $loginName, $password, false);
+			->with($this->request, $user->getUID(), $loginName, $password, IToken::REMEMBER);
 		$this->twoFactorManager->expects($this->once())
 			->method('isTwoFactorAuthenticated')
 			->with($user)
@@ -535,7 +523,7 @@ class LoginControllerTest extends TestCase {
 			->will($this->returnValue($user));
 		$this->userSession->expects($this->once())
 			->method('createSessionToken')
-			->with($this->request, $user->getUID(), 'Jane', $password, false);
+			->with($this->request, $user->getUID(), 'Jane', $password, IToken::REMEMBER);
 		$this->userSession->expects($this->once())
 			->method('isLoggedIn')
 			->with()
@@ -574,7 +562,7 @@ class LoginControllerTest extends TestCase {
 			->with($user, ['loginName' => 'john@doe.com', 'password' => $password]);
 		$this->userSession->expects($this->once())
 			->method('createSessionToken')
-			->with($this->request, $user->getUID(), 'john@doe.com', $password, false);
+			->with($this->request, $user->getUID(), 'john@doe.com', $password, IToken::REMEMBER);
 		$this->twoFactorManager->expects($this->once())
 			->method('isTwoFactorAuthenticated')
 			->with($user)
@@ -628,7 +616,7 @@ class LoginControllerTest extends TestCase {
 			->with($user, ['loginName' => 'john@doe.com', 'password' => $password]);
 		$this->userSession->expects($this->once())
 			->method('createSessionToken')
-			->with($this->request, $user->getUID(), 'john@doe.com', $password, false);
+			->with($this->request, $user->getUID(), 'john@doe.com', $password, IToken::REMEMBER);
 		$this->twoFactorManager->expects($this->once())
 			->method('isTwoFactorAuthenticated')
 			->with($user)