diff --git a/lib/private/Server.php b/lib/private/Server.php
index 9d54421e3e..ad658373c7 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -361,6 +361,10 @@ class Server extends ServerContainer implements IServerContainer {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
 			});
+			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+				/** @var $user \OC\User\User */
+				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+			});
 			$userSession->listen('\OC\User', 'logout', function () {
 				\OC_Hook::emit('OC_User', 'logout', array());
 			});
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index ac0150ff61..f818666c37 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -792,7 +792,13 @@ class Session implements IUserSession, Emitter {
 		$this->setToken($token->getId());
 		$this->lockdownManager->setToken($token);
 		$user->updateLastLoginTimestamp();
-		$this->manager->emit('\OC\User', 'postRememberedLogin', [$user]);
+		$password = null;
+		try {
+			$password = $this->tokenProvider->getPassword($token, $sessionId);
+		} catch (PasswordlessTokenException $ex) {
+			// Ignore
+		}
+		$this->manager->emit('\OC\User', 'postRememberedLogin', [$user, $password]);
 		return true;
 	}