diff --git a/app/api/auth.py b/app/api/auth.py
index 7d1a7d6..6884c71 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -11,7 +11,7 @@ from app.services.audit import AuditService
 
 router = APIRouter()
 
-@router.post("/register", response_model=UserRead)
+@router.post("/register", response_model=Token)
 async def register(
     user_in: UserCreate,
     request: Request,
@@ -45,7 +45,15 @@ async def register(
         ip_address=request.client.host if request.client else None
     )
     
-    return user
+    # Return tokens
+    access_token = create_access_token({"sub": str(user.id), "email": user.email})
+    refresh_token = create_refresh_token({"sub": str(user.id), "email": user.email})
+    
+    return Token(
+        access_token=access_token,
+        refresh_token=refresh_token,
+        token_type="bearer"
+    )
 
 @router.post("/login", response_model=Token)
 async def login(