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 b25292d4..95d772cc 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
@@ -13,7 +13,6 @@ import com.eu.habbo.habbohotel.users.subscriptions.SubscriptionHabboClub;
 import com.eu.habbo.messages.NoAuthMessage;
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.incoming.MessageHandler;
-import com.eu.habbo.messages.outgoing.achievements.AchievementListComposer;
 import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAccountInfoComposer;
 import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameListComposer;
 import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
@@ -24,13 +23,13 @@ import com.eu.habbo.messages.outgoing.handshake.SecureLoginOKComposer;
 import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer;
 import com.eu.habbo.messages.outgoing.handshake.PingComposer;
 import com.eu.habbo.messages.outgoing.inventory.InventoryAchievementsComposer;
-import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer;
 import com.eu.habbo.messages.outgoing.inventory.UserEffectsListComposer;
 import com.eu.habbo.messages.outgoing.modtool.CfhTopicsMessageComposer;
 import com.eu.habbo.messages.outgoing.modtool.ModToolComposer;
 import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer;
 import com.eu.habbo.messages.outgoing.navigator.*;
 import com.eu.habbo.messages.outgoing.unknown.BuildersClubExpiredComposer;
+import com.eu.habbo.messages.outgoing.mysterybox.MysteryBoxKeysComposer;
 import com.eu.habbo.messages.outgoing.users.*;
 import com.eu.habbo.plugin.events.emulator.SSOAuthenticationEvent;
 import com.eu.habbo.plugin.events.users.UserLoginEvent;
@@ -125,7 +124,7 @@ public class SecureLoginEvent extends MessageHandler {
                 messages.add(new EnableNotificationsComposer(Emulator.getConfig().getBoolean("bubblealerts.enabled", true)).compose());
                 messages.add(new UserAchievementScoreComposer(this.client.getHabbo()).compose());
                 messages.add(new IsFirstLoginOfDayComposer(true).compose());
-                messages.add(new UnknownComposer5().compose());
+                messages.add(new MysteryBoxKeysComposer().compose());
                 messages.add(new BuildersClubExpiredComposer().compose());
                 messages.add(new CfhTopicsMessageComposer().compose());
                 messages.add(new FavoriteRoomsCountComposer(this.client.getHabbo()).compose());
@@ -133,8 +132,6 @@ public class SecureLoginEvent extends MessageHandler {
                 messages.add(new GameCenterAccountInfoComposer(3, 100).compose());
                 messages.add(new GameCenterAccountInfoComposer(0, 100).compose());
 
-                //messages.add(new MessengerInitComposer(this.client.getHabbo()).compose());
-                //messages.add(new FriendsComposer(this.client.getHabbo()).compose());
                 messages.add(new UserClubComposer(this.client.getHabbo(), SubscriptionHabboClub.HABBO_CLUB, UserClubComposer.RESPONSE_TYPE_LOGIN).compose());
 
                 if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) {
diff --git a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java
index e38663e7..173ec13f 100644
--- a/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java
+++ b/src/main/java/com/eu/habbo/messages/outgoing/Outgoing.java
@@ -212,7 +212,7 @@ public class Outgoing {
 
     //Uknown but work
     public final static int IsFirstLoginOfDayComposer = 793; // PRODUCTION-201611291003-338511768 //Quest Engine
-    public final static int UnknownComposer5 = 2833; // PRODUCTION-201611291003-338511768 //Mysterbox
+    public final static int MysteryBoxKeysComposer = 2833; // PRODUCTION-201611291003-338511768 //Mysterbox
     public final static int IgnoredUsersComposer = 126; // PRODUCTION-201611291003-338511768
     public final static int NewNavigatorMetaDataComposer = 3052; // PRODUCTION-201611291003-338511768
     public final static int NewNavigatorSearchResultsComposer = 2690; // PRODUCTION-201611291003-338511768
diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java b/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java
similarity index 66%
rename from src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java
rename to src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java
index 7cea96ee..8aa8d340 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java
+++ b/src/main/java/com/eu/habbo/messages/outgoing/mysterybox/MysteryBoxKeysComposer.java
@@ -1,13 +1,13 @@
-package com.eu.habbo.messages.incoming.handshake;
+package com.eu.habbo.messages.outgoing.mysterybox;
 
 import com.eu.habbo.messages.ServerMessage;
 import com.eu.habbo.messages.outgoing.MessageComposer;
 import com.eu.habbo.messages.outgoing.Outgoing;
 
-public class UnknownComposer5 extends MessageComposer {
+public class MysteryBoxKeysComposer extends MessageComposer {
     @Override
     protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UnknownComposer5);
+        this.response.init(Outgoing.MysteryBoxKeysComposer);
         this.response.appendString(""); //Box color
         this.response.appendString(""); //Key color
         return this.response;
diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java
deleted file mode 100644
index f9e18d7a..00000000
--- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.eu.habbo.messages.outgoing.unknown;
-
-import com.eu.habbo.messages.ServerMessage;
-import com.eu.habbo.messages.outgoing.MessageComposer;
-import com.eu.habbo.messages.outgoing.Outgoing;
-
-public class UnknownComposer5 extends MessageComposer {
-    @Override
-    protected ServerMessage composeInternal() {
-        this.response.init(Outgoing.UnknownComposer5);
-        this.response.appendInt(0);
-        return this.response;
-    }
-}