diff --git a/typescript/client/src/app/pages/dashboard/users/UserSettingsPage.tsx b/typescript/client/src/app/pages/dashboard/users/UserSettingsPage.tsx
index 2884a296f..3d1794fe9 100644
--- a/typescript/client/src/app/pages/dashboard/users/UserSettingsPage.tsx
+++ b/typescript/client/src/app/pages/dashboard/users/UserSettingsPage.tsx
@@ -306,7 +306,7 @@ function ChangePasswordForm({ reqUser }: { reqUser: UserDocument }) {
 
 function ChangeUsernameForm({ reqUser }: { reqUser: UserDocument }) {
 	const lastUsernameChange = useApiQuery<
-		{ canChange: false; nextAvailableChange: integer | null } | { canChange: true }
+		{ canChange: false; nextChange: integer | null } | { canChange: true }
 	>(`/users/${reqUser.id}/last-username-change`);
 
 	const nameChangeFormik = useFormik({
@@ -424,10 +424,7 @@ function ChangeUsernameForm({ reqUser }: { reqUser: UserDocument }) {
 					<Alert variant="danger">
 						You can only change your username every 6 months. Your next username change
 						will be available on{" "}
-						{new Date(
-							lastUsernameChange.data?.nextAvailableChange ?? 0,
-						).toLocaleDateString()}
-						.
+						{new Date(lastUsernameChange.data?.nextChange ?? 0).toLocaleDateString()}.
 					</Alert>
 				)}
 				<Button
diff --git a/typescript/server/src/server/middleware/update-last-seen.ts b/typescript/server/src/server/middleware/update-last-seen.ts
index ffcb29817..f2f48a783 100644
--- a/typescript/server/src/server/middleware/update-last-seen.ts
+++ b/typescript/server/src/server/middleware/update-last-seen.ts
@@ -3,24 +3,24 @@ import type { RequestHandler } from "express";
 import DB from "#services/pg/db";
 import { sql } from "kysely";
 
-export const UpdateLastSeen: RequestHandler = (req, _res, next) => {
-	if (req.session.tachi?.user.id === undefined) {
-		next();
-		return;
-	}
+export const UpdateLastSeen: RequestHandler = (req, res, next) => {
+	res.once("finish", () => {
+		if (req.session?.tachi?.user.id === undefined) {
+			return;
+		}
 
-	if (req.session.tachi.settings.preferences.invisible) {
-		next();
-		return;
-	}
+		if (req.session.tachi.settings.preferences.invisible) {
+			return;
+		}
 
-	// fire, but we have no reason to await it.
-	void DB.updateTable("account")
-		.set({
-			last_seen: sql`NOW()`,
-		})
-		.where("id", "=", req.session.tachi.user.id)
-		.execute();
+		// fire, but we have no reason to await it.
+		void DB.updateTable("account")
+			.set({
+				last_seen: sql`NOW()`,
+			})
+			.where("id", "=", req.session.tachi.user.id)
+			.execute();
+	});
 
 	next();
 };