diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 3c81ed5242ab6..8f10f1631abc3 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -98,7 +98,7 @@ function __construct($appName,
 	 * @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/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index 600179a1dc5f3..8132f2eec0b96 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -89,7 +89,7 @@ public function testLogoutWithoutToken() {
 		$this->request
 			->expects($this->once())
 			->method('getCookie')
-			->with('oc_token')
+			->with('nc_token')
 			->willReturn(null);
 		$this->config
 			->expects($this->never())
@@ -108,7 +108,7 @@ public function testLogoutWithToken() {
 		$this->request
 			->expects($this->once())
 			->method('getCookie')
-			->with('oc_token')
+			->with('nc_token')
 			->willReturn('MyLoginToken');
 		$user = $this->getMockBuilder('\\OCP\\IUser')->getMock();
 		$user