diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 52bd221395..e9911d0191 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -98,7 +98,7 @@ class LoginController extends Controller {
 	 * @return RedirectResponse
 	 */
 	public function logout() {
-		$loginToken = $this->request->getCookie('oc_token');
+		$loginToken = $this->request->getCookie('nc_token');
 		if (!is_null($loginToken)) {
 			$this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken);
 		}
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index 62d7fc7ed3..404c31879d 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -490,7 +490,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	 * @return bool
 	 */
 	private function cookieCheckRequired() {
-		if($this->getCookie(session_name()) === null && $this->getCookie('oc_token') === null) {
+		if($this->getCookie(session_name()) === null && $this->getCookie('nc_token') === null) {
 			return false;
 		}
 
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index a1a4452abf..72f921724a 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -89,7 +89,7 @@ class LoginControllerTest extends TestCase {
 		$this->request
 			->expects($this->once())
 			->method('getCookie')
-			->with('oc_token')
+			->with('nc_token')
 			->willReturn(null);
 		$this->config
 			->expects($this->never())
@@ -108,7 +108,7 @@ class LoginControllerTest extends TestCase {
 		$this->request
 			->expects($this->once())
 			->method('getCookie')
-			->with('oc_token')
+			->with('nc_token')
 			->willReturn('MyLoginToken');
 		$user = $this->getMockBuilder('\\OCP\\IUser')->getMock();
 		$user
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
index b1515b0efb..6c6504b4de 100644
--- a/tests/lib/AppFramework/Http/RequestTest.php
+++ b/tests/lib/AppFramework/Http/RequestTest.php
@@ -1651,7 +1651,7 @@ class RequestTest extends \Test\TestCase {
 						'HTTP_REQUESTTOKEN' => 'AAAHGxsTCTc3BgMQESAcNR0OAR0=:MyTotalSecretShareds',
 					],
 					'cookies' => [
-						'oc_token' => 'asdf',
+						'nc_token' => 'asdf',
 					],
 				],
 				$this->secureRandom,