diff --git a/api/routes/session.ts b/api/routes/session.ts
index b82c9c7..f321029 100644
--- a/api/routes/session.ts
+++ b/api/routes/session.ts
@@ -21,15 +21,14 @@ app.post("/create", async (req: Request, res: Response) => {
     const userData = await getUser(token.access_token).catch(() => undefined);
     if (!userData) return res.status(400).json({message: "The provided token is wrong"});
 
-    // Update or insert user
-    await User.updateOne({clientId: userData.id}, {
-        username: userData.username + "#" + userData.discriminator,
-        avatarId: userData.avatar, locale: userData.locale,
-        accessToken: token.access_token, refreshToken: token.refresh_token,
-    }, {upsert: true});
+    await User.upsert({
+        clientId: parseInt(userData.id), avatarId: userData.avatar === null ? undefined : userData.avatar,
+        locale: userData.locale, accessToken: token.access_token, refreshToken: token.refresh_token,
+        username: userData.username
+    });
 
     // Create token
-    const appToken = await Token.create({clientId: userData.id, userAgent: req.headers['user-agent']});
+    const appToken = await Token.create({clientId: parseInt(userData.id), userAgent: req.headers['user-agent']});
 
     // Return token
     res.json({token: appToken.token});