diff --git a/database/entities/RawActor.ts b/database/entities/RawActor.ts
index 2b448327..c3e571d6 100644
--- a/database/entities/RawActor.ts
+++ b/database/entities/RawActor.ts
@@ -128,22 +128,24 @@ export class RawActor extends BaseEntity {
 			this.data;
 
 		const statusCount = await RawActivity.createQueryBuilder("activity")
-			.leftJoinAndSelect("activity.actor", "actor")
-			.where("actor.data @> :data", {
+			.leftJoinAndSelect("activity.actors", "actors")
+			.where("actors.data @> :data", {
 				data: JSON.stringify({
 					id: this.data.id,
 				}),
 			})
 			.getCount();
 
+		const isLocalUser = this.getInstanceDomain() == getHost();
+
 		return {
 			id: this.id,
 			username: preferredUsername ?? "",
 			display_name: name ?? preferredUsername ?? "",
 			note: summary ?? "",
-			url: `${
-				config.http.base_url
-			}/@${preferredUsername}@${this.getInstanceDomain()}`,
+			url: `${config.http.base_url}/@${preferredUsername}${
+				isLocalUser ? "" : `@${this.getInstanceDomain()}`
+			}`,
 			avatar:
 				((icon as APImage).url as string | undefined) ??
 				config.defaults.avatar,
diff --git a/database/entities/Token.ts b/database/entities/Token.ts
index 813b828a..db14c330 100644
--- a/database/entities/Token.ts
+++ b/database/entities/Token.ts
@@ -52,6 +52,6 @@ export class Token extends BaseEntity {
 /**
  * The type of token.
  */
-enum TokenType {
-	BEARER = "bearer",
+export enum TokenType {
+	BEARER = "Bearer",
 }
diff --git a/server/api/api/v1/accounts/update_credentials/index.ts b/server/api/api/v1/accounts/update_credentials/index.ts
index 81c50ec7..6097e5ee 100644
--- a/server/api/api/v1/accounts/update_credentials/index.ts
+++ b/server/api/api/v1/accounts/update_credentials/index.ts
@@ -59,6 +59,7 @@ export default async (req: Request): Promise<Response> => {
 			);
 		}
 
+		user.actor.data.name = display_name;
 		user.display_name = display_name;
 	}
 
@@ -71,6 +72,7 @@ export default async (req: Request): Promise<Response> => {
 			);
 		}
 
+		user.actor.data.summary = note;
 		user.note = note;
 	}