diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java
index 5f6ae287..b7d05c3f 100644
--- a/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java
+++ b/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java
@@ -54,7 +54,7 @@ public class BadgeCommand extends Command
                 {
                     boolean found;
 
-                    try (PreparedStatement statement = connection.prepareStatement("SELECT badge_code FROM users_badges INNER JOIN users ON users.id = user_id WHERE users.username = ? AND badge_code = ? LIMIT 1"))
+                    try (PreparedStatement statement = connection.prepareStatement("SELECT `badge_code` FROM `users_badges` INNER JOIN `users` ON `users`.`id` = `user_id` WHERE `users`.`username` = ? AND `badge_code` = ? LIMIT 1"))
                     {
                         statement.setString(1, params[1]);
                         statement.setString(2, params[2]);
@@ -71,7 +71,7 @@ public class BadgeCommand extends Command
                     }
                     else
                     {
-                        try (PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges VALUES (null, (SELECT id FROM users WHERE username = ? LIMIT 1), 0, ?)"))
+                        try (PreparedStatement statement = connection.prepareStatement("INSERT INTO users_badges (`id`, `user_id`, `slot_id`, `badge_code`) VALUES (null, (SELECT `id` FROM `users` WHERE `username` = ? LIMIT 1), 0, ?)"))
                         {
                             statement.setString(1, params[1]);
                             statement.setString(2, params[2]);
diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java
index a88f7835..64107ea0 100644
--- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java
+++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java
@@ -333,7 +333,7 @@ public class HabboManager
             if (!oldRank.getBadge().isEmpty())
             {
                 habbo.deleteBadge(habbo.getInventory().getBadgesComponent().getBadge(oldRank.getBadge()));
-                BadgesComponent.deleteBadge(userId, oldRank.getBadge());
+                //BadgesComponent.deleteBadge(userId, oldRank.getBadge()); // unnecessary as Habbo.deleteBadge does this
             }
 
             habbo.getHabboInfo().setRank(newRank);
diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
index a66ee949..16e56a7d 100644
--- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
+++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/BadgesComponent.java
@@ -43,7 +43,7 @@ public class BadgesComponent
 
                         for (Rank rank : Emulator.getGameEnvironment().getPermissionsManager().getRanks(badge.getCode()))
                         {
-                            if (rank.getId() == habbo.getHabboInfo().getId())
+                            if (rank.getId() == habbo.getHabboInfo().getRank().getId())
                             {
                                 delete = false;
                                 break;