@@ -33,14 +33,17 @@ async def get_by_token_hash(self, token_hash: str) -> RefreshToken | None:
         )
 
     async def save(self, refresh_token: RefreshToken) -> RefreshToken:
-        model = RefreshTokenModel(
-            user_id=refresh_token.user_id,
-            tenant_id=self._tenant_id,
-            refresh_token_hash=refresh_token.token_hash,
-            expires_at=refresh_token.expires_at,
-            is_revoked=refresh_token.is_revoked,
-        )
-        self.db.add(model)
+        model_kwargs = {
+            "user_id": refresh_token.user_id,
+            "tenant_id": self._tenant_id,
+            "refresh_token_hash": refresh_token.token_hash,
+            "expires_at": refresh_token.expires_at,
+            "is_revoked": refresh_token.is_revoked,
+        }
+        if refresh_token.id is not None:
+            model_kwargs["id"] = refresh_token.id
+        model = RefreshTokenModel(**model_kwargs)
+        model = await self.db.merge(model)
         await self.db.flush()
         await self.db.refresh(model)
         return RefreshToken(
 
@@ -90,6 +90,7 @@ async def save(self, user: User) -> User:
                 model_kwargs["id"] = user.id
             user_model = UserModel(**model_kwargs)
             self._db.add(user_model)
+            await self._db.flush()
 
             # Create default related records
             await self._create_default_related_records(user_model.id)