Index: finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java
===================================================================
--- finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java	(revision 3de009b3a9676182b474a121be9e8d177d692101)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java	(revision 929e93c33edbce0bd95761ba0c816259b90f33d4)
@@ -46,4 +46,10 @@
     private String username;
 
+    @Column(nullable = false)
+    private boolean artist;
+
+    @Column(nullable = false)
+    private boolean listener;
+
     @Column(name = "profile_photo", length = Integer.MAX_VALUE)
     private String profilePhoto;
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 3de009b3a9676182b474a121be9e8d177d692101)
+++ finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java	(revision 929e93c33edbce0bd95761ba0c816259b90f33d4)
@@ -130,5 +130,7 @@
                 .email(authRequestDto.email())
                 .password(passwordEncoder.encode(authRequestDto.password()))
-                .role(Role.NONADMIN);
+                .role(Role.NONADMIN)
+                .artist(authRequestDto.userType().contains(UserType.ARTIST))
+                .listener(authRequestDto.userType().contains(UserType.LISTENER));
 
 
@@ -157,10 +159,10 @@
         nonAdminUserRepository.save(nonAdminUser);
 
-        if (authRequestDto.userType().contains(UserType.ARTIST)){
+        if (user.isArtist()){
             Artist artist = new Artist();
             artist.setNonAdminUser(nonAdminUser);
             artistRepository.save(artist);
         }
-        if (authRequestDto.userType().contains(UserType.LISTENER)){
+        if (user.isListener()){
             Listener listener = new Listener();
             listener.setNonAdminUser(nonAdminUser);