diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
index dc34594e5..8c3fd57fa 100644
--- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
@@ -950,7 +950,7 @@ class ApiV1Dot1Controller extends Controller
     {
         abort_if(! $request->user() || ! $request->user()->token() || ! $username, 403);
         abort_unless($request->user()->tokenCan('read'), 403);
-
+        $username = trim($username);
         $rateLimiting = (bool) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.enabled');
         $ipRateLimiting = (bool) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.ip_enabled');
         if ($ipRateLimiting) {
@@ -997,6 +997,11 @@ class ApiV1Dot1Controller extends Controller
                 'X-Rate-Limit-Reset' => RateLimiter::availableIn($userKey),
             ];
         }
+        if(str_ends_with($username, config_cache('pixelfed.domain.app'))) {
+            $pre = str_starts_with($username, '@') ? substr($username, 1) : $username;
+            $parts = explode('@', $pre);
+            $username = $parts[0];
+        }
         $accountId = AccountService::usernameToId($username, true);
         if (! $accountId) {
             return [];