diff --git a/server/src/main/java/ru/dragonestia/picker/model/Room.java b/server/src/main/java/ru/dragonestia/picker/model/Room.java
index a4ea965..ff21dca 100644
--- a/server/src/main/java/ru/dragonestia/picker/model/Room.java
+++ b/server/src/main/java/ru/dragonestia/picker/model/Room.java
@@ -8,6 +8,8 @@ import ru.dragonestia.picker.api.model.room.RoomDetails;
 import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
 import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
 
+import java.util.Objects;
+
 public class Room implements IRoom {
 
     private final String identifier;
@@ -80,7 +82,7 @@ public class Room implements IRoom {
 
     @Override
     public int hashCode() {
-        return identifier.hashCode();
+        return Objects.hash(identifier, nodeIdentifier);
     }
 
     @Override
@@ -88,7 +90,7 @@ public class Room implements IRoom {
         if (object == this) return true;
         if (object == null) return false;
         if (object instanceof Room other) {
-            return identifier.equals(other.identifier);
+            return identifier.equals(other.identifier) && nodeIdentifier.equals(other.nodeIdentifier);
         }
         return false;
     }
diff --git a/server/src/main/java/ru/dragonestia/picker/model/User.java b/server/src/main/java/ru/dragonestia/picker/model/User.java
index 1af895b..83ef361 100644
--- a/server/src/main/java/ru/dragonestia/picker/model/User.java
+++ b/server/src/main/java/ru/dragonestia/picker/model/User.java
@@ -29,6 +29,11 @@ public class User implements IUser {
         return new ResponseUser(identifier);
     }
 
+    @Override
+    public String toString() {
+        return identifier;
+    }
+
     @Override
     public int hashCode() {
         return identifier.hashCode();