diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 914baebdf6f1af413ddbdddf488bbae4f0b9c97a..f2964fecca3a3b5cba87070f85b5bdf648c0b520 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -52,7 +52,7 @@ class Manager extends PublicEmitter {
 				unset($cachedUsers[$i]);
 			}
 		});
-		$this->listen('\OC\User', 'postLogin', function ($user, $pw) {
+		$this->listen('\OC\User', 'postLogin', function ($user) {
 			$user->updateLastLoginTimestamp();
 		});
 		$this->listen('\OC\User', 'postRememberedLogin', function ($user) {
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 3f9d43e29527140ea31a6dd9c42d1bb3d1794c7f..2845a9c964a8bba9d5721508e727752271b9f99c 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -196,10 +196,8 @@ class Session extends \PHPUnit_Framework_TestCase {
 						switch($key) {
 							case 'user_id':
 								return true;
-								break;
 							default:
 								return false;
-								break;
 						}
 					},
 					'foo'));