diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php
index f650af0587..781547854a 100644
--- a/src/Module/Api/Mastodon/Accounts.php
+++ b/src/Module/Api/Mastodon/Accounts.php
@@ -38,6 +38,8 @@ class Accounts extends BaseApi
 	 */
 	public static function rawContent(array $parameters = [])
 	{
+		$uid = self::getCurrentUserID();
+
 		if (empty($parameters['id']) && empty($parameters['name'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
@@ -56,7 +58,7 @@ class Accounts extends BaseApi
 			}
 		}
 
-		$account = DI::mstdnAccount()->createFromContactId($id, self::getCurrentUserID());
+		$account = DI::mstdnAccount()->createFromContactId($id, $uid);
 		System::jsonExit($account);
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index bdd21c7375..d877629fb5 100644
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -40,7 +40,7 @@ class Follow extends BaseApi
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		$cid = Contact::follow($parameters['id'], self::getCurrentUserID());
+		$cid = Contact::follow($parameters['id'], $uid);
 
 		System::jsonExit(DI::mstdnRelationship()->createFromContactId($cid, $uid)->toArray());
 	}
diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index 07a1e5adc2..3b281392bf 100644
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -42,6 +42,8 @@ class Statuses extends BaseApi
 	 */
 	public static function rawContent(array $parameters = [])
 	{
+		$uid = self::getCurrentUserID();
+
 		if (empty($parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
@@ -66,8 +68,6 @@ class Statuses extends BaseApi
 
 		$params = ['order' => ['uri-id' => true], 'limit' => $request['limit']];
 
-		$uid = self::getCurrentUserID();
-
 		if (!$uid) {
 			$condition = ['author-id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED],
 				'uid' => 0, 'network' => Protocol::FEDERATED];
diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 67db0b81f2..2d7fea3dd5 100644
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -34,7 +34,6 @@ class Lists extends BaseApi
 	public static function delete(array $parameters = [])
 	{
 		self::login(self::SCOPE_WRITE);
-
 		$uid = self::getCurrentUserID();
 
 		if (empty($parameters['id'])) {
@@ -55,8 +54,7 @@ class Lists extends BaseApi
 	public static function post(array $parameters = [])
 	{
 		self::login(self::SCOPE_WRITE);
-
-		$uid   = self::getCurrentUserID();
+		$uid = self::getCurrentUserID();
 
 		$request = self::getRequest([
 			'title' => '',
diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 8e13afb2fa..f2ff792dbc 100644
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -219,10 +219,12 @@ class Statuses extends BaseApi
 	 */
 	public static function rawContent(array $parameters = [])
 	{
+		$uid = self::getCurrentUserID();
+
 		if (empty($parameters['id'])) {
 			DI::mstdnError()->UnprocessableEntity();
 		}
 
-		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], self::getCurrentUserID()));
+		System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid));
 	}
 }
diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 5e5b3986b1..7c3e63ee84 100644
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -173,21 +173,9 @@ class BaseApi extends BaseModule
 	}
 
 	/**
-	 * Log in user via OAuth or Simple HTTP Auth.
-	 *
-	 * Simple Auth allow username in form of <pre>user@server</pre>, ignoring server part
+	 * Log in user via OAuth or Basic HTTP Auth.
 	 *
 	 * @param string $scope the requested scope (read, write, follow)
-	 *
-	 * @throws HTTPException\ForbiddenException
-	 * @throws HTTPException\UnauthorizedException
-	 * @throws HTTPException\InternalServerErrorException
-	 * @hook  'authenticate'
-	 *               array $addon_auth
-	 *               'username' => username from login form
-	 *               'password' => password from login form
-	 *               'authenticated' => return status,
-	 *               'user_record' => return authenticated user record
 	 */
 	protected static function login(string $scope)
 	{