Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java	(revision b81f586e70cb00f432e8f000256d7c6e13295e7c)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java	(revision 561e9a62054c2d30e2b9f75a4f7177606ec2b11f)
@@ -17,10 +17,8 @@
 
 import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.AuthResponseDto;
 import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
 import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.service.AuthService;
 
-import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +37,7 @@
             HttpServletResponse httpServletResponse){
         try {
-            AuthResponseDto authResponse = authService.registerAndLogIn(httpServletResponse, authRequestDto);
+            UserResponseDto userResponseDto = authService.registerAndLogIn(httpServletResponse, authRequestDto);
             return ResponseEntity.ok(Map.of(
-                    "user", authResponse.userResponseDto(),
+                    "user", userResponseDto,
                     "tokenExpiresIn", accessTokenMaxAge
             ));
@@ -56,7 +54,7 @@
             HttpServletResponse httpServletResponse){
         try {
-            AuthResponseDto authResponse = authService.login(httpServletResponse, loginRequestDto);
+            UserResponseDto userResponseDto = authService.login(httpServletResponse, loginRequestDto);
             return ResponseEntity.ok(Map.of(
-                    "user", authResponse.userResponseDto(),
+                    "user", userResponseDto,
                     "tokenExpiresIn", accessTokenMaxAge
                     )
Index: nkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/AuthResponseDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/dto/AuthResponseDto.java	(revision b81f586e70cb00f432e8f000256d7c6e13295e7c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package com.ukim.finki.develop.finkwave.dto;
-
-import com.ukim.finki.develop.finkwave.model.RefreshToken;
-
-public record AuthResponseDto (String accessToken, RefreshToken refreshToken, UserResponseDto userResponseDto) {
-}
-
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java	(revision b81f586e70cb00f432e8f000256d7c6e13295e7c)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java	(revision 561e9a62054c2d30e2b9f75a4f7177606ec2b11f)
@@ -6,5 +6,4 @@
 
 import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.AuthResponseDto;
 import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.model.NonAdminUser;
@@ -32,5 +31,5 @@
     // todo: should it be transactional?
 //    @Transactional
-    public AuthResponseDto registerAndLogIn(HttpServletResponse response, AuthRequestDto authRequestDto){
+    public UserResponseDto registerAndLogIn(HttpServletResponse response, AuthRequestDto authRequestDto){
         if (userRepository.findByUsername(authRequestDto.username()).isPresent()){
             throw new RuntimeException("User already exists");
@@ -56,5 +55,5 @@
 
     // todo: dto in arguments or the standalone values?
-    public AuthResponseDto login(HttpServletResponse response, LoginRequestDto loginRequestDto){
+    public UserResponseDto login(HttpServletResponse response, LoginRequestDto loginRequestDto){
         User user = userRepository.findByUsername(loginRequestDto.username())
                 .orElseThrow(() -> new RuntimeException("Invalid credentials"));
@@ -67,8 +66,6 @@
 
         UserResponseDto userResponseDto = new UserResponseDto(user.getUsername(), user.getRole());
-        // todo: dto inside a dto??
-        AuthResponseDto authResponseDto = new AuthResponseDto(accessToken, refreshToken, userResponseDto);
-        addTokensToResponse(response, authResponseDto);
-        return authResponseDto;
+        addTokensToResponse(response, refreshToken, accessToken);
+        return userResponseDto;
     }
 
@@ -123,6 +120,6 @@
 
 
-    private void addTokensToResponse(HttpServletResponse response, AuthResponseDto authResponse){
-        Cookie refreshCookie = new Cookie("refreshToken", authResponse.refreshToken().getToken());
+    private void addTokensToResponse(HttpServletResponse response, RefreshToken refreshToken, String accessToken){
+        Cookie refreshCookie = new Cookie("refreshToken", refreshToken.getToken());
         refreshCookie.setSecure(false);
         refreshCookie.setHttpOnly(true);
@@ -131,5 +128,5 @@
         response.addCookie(refreshCookie);
 
-        addAccessCookieToResponse(response, authResponse.accessToken());
+        addAccessCookieToResponse(response, accessToken);
     }
 }