diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
index 95d772cc..ac1b60b6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
@@ -114,7 +114,7 @@ public class SecureLoginEvent extends MessageHandler {
                 ArrayList<ServerMessage> messages = new ArrayList<>();
 
                 messages.add(new SecureLoginOKComposer().compose());
-                messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), 0).compose());
+                messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom()).compose());
                 messages.add(new UserEffectsListComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose());
                 messages.add(new UserClothesComposer(this.client.getHabbo()).compose());
                 messages.add(new NewUserIdentityComposer(habbo).compose());
diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java
index 3f8544e3..7a39e005 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetHomeRoomEvent.java
@@ -10,7 +10,7 @@ public class SetHomeRoomEvent extends MessageHandler {
 
         if (roomId != this.client.getHabbo().getHabboInfo().getHomeRoom()) {
             this.client.getHabbo().getHabboInfo().setHomeRoom(roomId);
-            this.client.sendResponse(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), this.client.getHabbo().getHabboInfo().getHomeRoom()));
+            this.client.sendResponse(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), 0));
         }
     }
 }
diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java
index 5ab9a8c3..4aeae0b3 100644
--- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java
+++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java
@@ -6,18 +6,18 @@ import com.eu.habbo.messages.outgoing.Outgoing;
 
 public class UserHomeRoomComposer extends MessageComposer {
     private final int homeRoom;
-    private final int newRoom;
+    private final int roomToEnter;
 
-    public UserHomeRoomComposer(int homeRoom, int newRoom) {
+    public UserHomeRoomComposer(int homeRoom, int roomToEnter) {
         this.homeRoom = homeRoom;
-        this.newRoom = newRoom;
+        this.roomToEnter = roomToEnter;
     }
 
     @Override
     protected ServerMessage composeInternal() {
         this.response.init(Outgoing.UserHomeRoomComposer);
         this.response.appendInt(this.homeRoom);
-        this.response.appendInt(this.newRoom);
+        this.response.appendInt(this.roomToEnter);
         return this.response;
     }
 }