diff --git a/nitter/nitter.php b/nitter/nitter.php
index 49808a126..e7cbb1af0 100644
--- a/nitter/nitter.php
+++ b/nitter/nitter.php
@@ -24,13 +24,13 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
 function nitter_install()
 {
-	Addon::registerHook ('prepare_body_final', 'addon/nitter/nitter.php', 'nitter_render');
+	Hook::register('prepare_body_final', 'addon/nitter/nitter.php', 'nitter_render');
 }
 
 /* Handle the send data from the admin settings
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 4201db661..e5295cc39 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -440,11 +440,16 @@ function windowsphonepush_login(App $a)
 		throw new UnauthorizedException('This api requires login');
 	}
 
-	$user_id = User::authenticate($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
+	try {
+		$user_id = User::getIdFromPasswordAuthentication($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
+		if ($user_id) {
+			$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
+		}
+	} catch (Exception $ex) {
+		$record = [];
+	}
 
-	if ($user_id) {
-		$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
-	} else {
+	if (empty($record)) {
 		Logger::info('API_login failure: ' . print_r($_SERVER, true));
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		throw new UnauthorizedException('This api requires login');