diff --git a/lib/base.php b/lib/base.php
index 2141695a93..28cc24f928 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -745,7 +745,7 @@ class OC {
 					if (isset($_COOKIE['oc_ignore_php_auth_user'])) {
 						// Ignore HTTP Authentication for 5 more mintues.
 						setcookie('oc_ignore_php_auth_user', '', time() + 300, $cookie_path);
-					} else {
+					} elseif ($_SERVER['PHP_AUTH_USER'] === self::$session->get('loginname')) {
 						// Ignore HTTP Aunthentication to allow a different user to log in.
 						setcookie('oc_ignore_php_auth_user', $_SERVER['PHP_AUTH_USER'], 0, $cookie_path);
 					}