diff --git a/src/pages/api/users/update.ts b/src/pages/api/users/update.ts
index aab28fa9..681cca55 100644
--- a/src/pages/api/users/update.ts
+++ b/src/pages/api/users/update.ts
@@ -158,7 +158,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 	delete updatedUser.password;
 	delete updatedUser.newPassword;
 
-	await db.collection("users").updateOne({id: queryId}, {$set: updatedUser});
+	await db.collection("users").updateOne({id: queryId ? (queryId as string) : req.session.user.id}, {$set: updatedUser});
 
 	if (!queryId) {
 		req.session.user = updatedUser ? {...updatedUser, id: req.session.user.id} : null;
@@ -169,7 +169,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 		await managePaymentRecords({...updatedUser, id: req.session.user!.id}, queryId);
 	}
 
-	res.status(200).json({user: {...updatedUser, id: req.session.user!.id}});
+	res.status(200).json({user: {...updatedUser, ...user, id: req.session.user!.id}});
 }
 
 export const config = {