Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java	(revision 2fa68412b9b98d47c6152c311f60608a6c7e9af9)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/dto/UserResponseDto.java	(revision c684a6db42ec9ce24ffb0e5c5779ca9a8df9af20)
@@ -1,5 +1,4 @@
 package com.ukim.finki.develop.finkwave.model.dto;
 
-import com.ukim.finki.develop.finkwave.model.Role;
 import jakarta.annotation.Nullable;
 import lombok.Builder;
@@ -10,4 +9,5 @@
         String username,
         @Nullable String profilePhoto,
-        Role role){
-}
+        Boolean isAdmin,
+        @Nullable Boolean isArtist
+){}
Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java	(revision 2fa68412b9b98d47c6152c311f60608a6c7e9af9)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/repository/SongRepository.java	(revision c684a6db42ec9ce24ffb0e5c5779ca9a8df9af20)
@@ -119,5 +119,5 @@
                      JOIN songs s on s.id = l.song_id
                      JOIN users u ON u.user_id = me.released_by
-                     WHERE l.listener_id = 2
+                     WHERE l.listener_id = :userId
                  ORDER BY l.song_id, l.timestamp DESC
              ) t
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 2fa68412b9b98d47c6152c311f60608a6c7e9af9)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java	(revision c684a6db42ec9ce24ffb0e5c5779ca9a8df9af20)
@@ -209,5 +209,6 @@
                 .username(user.getUsername())
                 .profilePhoto(user.getProfilePhoto())
-                .role(user.getRole())
+                .isAdmin(user.getRole().equals(Role.ADMIN))
+                .isArtist(user.isArtist())
                 .build();
     }
Index: frontend/src/utils/types.ts
===================================================================
--- frontend/src/utils/types.ts	(revision 2fa68412b9b98d47c6152c311f60608a6c7e9af9)
+++ frontend/src/utils/types.ts	(revision c684a6db42ec9ce24ffb0e5c5779ca9a8df9af20)
@@ -4,5 +4,6 @@
 	email?: string;
 	profilePhoto?: string | null;
-	role?: "ADMIN" | "NONADMIN";
+	isAdmin: boolean;
+	isArtist: boolean;
 }