diff --git a/src/ohmyapi/builtin/auth/models.py b/src/ohmyapi/builtin/auth/models.py
index e8894c1..2d58ce1 100644
--- a/src/ohmyapi/builtin/auth/models.py
+++ b/src/ohmyapi/builtin/auth/models.py
@@ -30,7 +30,11 @@ class User(Model):
     is_admin: bool = field.BooleanField(default=False)
     is_staff: bool = field.BooleanField(default=False)
     groups: field.ManyToManyRelation[Group] = field.ManyToManyField(
-        "ohmyapi_auth.Group", related_name="users", through="ohmyapi_auth_user_groups"
+        "ohmyapi_auth.Group",
+        related_name="users",
+        through="ohmyapi_auth.UserGroups",
+        forward_key="user_id",
+        backward_key="group_id",
     )
 
     class Schema:
diff --git a/src/ohmyapi/builtin/auth/routes.py b/src/ohmyapi/builtin/auth/routes.py
index efda1b2..855126f 100644
--- a/src/ohmyapi/builtin/auth/routes.py
+++ b/src/ohmyapi/builtin/auth/routes.py
@@ -214,7 +214,7 @@ async def refresh_token(refresh_token: TokenRefresh = Body(...)):
         )
 
     user_id = payload.get("sub")
-    user = await User.filter(id=user_id).first()
+    user = await User.get(id=user_id)
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found"