diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordLinkCommand.java b/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordLinkCommand.java
index 54bbb60..59a13b0 100644
--- a/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordLinkCommand.java
+++ b/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordLinkCommand.java
@@ -93,6 +93,7 @@ public class DiscordLinkCommand extends DiscordCommand {
                 .queue(message1 -> message1.delete().queueAfter(5, TimeUnit.SECONDS));
 
         DiscordLinkPlayer.addDiscordLinkPlayer(discordLinkPlayer);
+        DiscordLink.getPlugin().getDatabase().syncPlayer(discordLinkPlayer);
         DiscordLink.getPlugin().getCache().removeCachedPlayer(discordLinkPlayer.getUuid());
     }
 
diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java b/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java
index 048f60c..d80efd7 100644
--- a/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java
+++ b/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java
@@ -42,7 +42,7 @@ public class DiscordUnlink extends DiscordCommand {
             message.getChannel().sendMessage("Your accounts aren't linked.").queue();
             return;
         }
-        database.removeLinkedAccount(discordLinkPlayer.getUuid());
+        database.removeLinkedAccount(discordLinkPlayer);
 
         discordLinkPlayer.updateDiscord(
                 DiscordRole.getDiscordRoles().stream()
diff --git a/src/main/java/com/alttd/proxydiscordlink/database/Database.java b/src/main/java/com/alttd/proxydiscordlink/database/Database.java
index 33fdf12..7b6cb33 100644
--- a/src/main/java/com/alttd/proxydiscordlink/database/Database.java
+++ b/src/main/java/com/alttd/proxydiscordlink/database/Database.java
@@ -85,16 +85,16 @@ public class Database {
         return false;
     }
 
-    public void removeLinkedAccount(UUID uuid) {
+    public void removeLinkedAccount(DiscordLinkPlayer player) {
         try {
             PreparedStatement statement = DatabaseConnection.getConnection()
                     .prepareStatement("DELETE FROM linked_accounts WHERE discord_id = ?");
-            statement.setString(1, uuid.toString());
+            statement.setLong(1, player.getUserId());
             statement.executeUpdate();
 
             PreparedStatement statement2 = DatabaseConnection.getConnection()
-                    .prepareStatement("DELETE FROM account_roles WHERE discord_id = ?");
-            statement2.setString(1, uuid.toString());
+                    .prepareStatement("DELETE FROM account_roles WHERE uuid = ?");
+            statement2.setString(1, player.getUuid().toString());
             statement2.executeUpdate();
         } catch (SQLException var2) {
             var2.printStackTrace();
diff --git a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java
index 7f41042..f699d9b 100644
--- a/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java
+++ b/src/main/java/com/alttd/proxydiscordlink/minecraft/commands/subcommands/Unlink.java
@@ -59,7 +59,7 @@ public class Unlink implements SubCommand {
         }
 
         DiscordLinkPlayer discordLinkPlayer = DiscordLinkPlayer.getDiscordLinkPlayer(player.getUniqueId());
-        database.removeLinkedAccount(discordLinkPlayer.getUuid());
+        database.removeLinkedAccount(discordLinkPlayer);
 
         discordLinkPlayer.updateDiscord(
                 DiscordRole.getDiscordRoles().stream()
diff --git a/src/main/java/com/alttd/proxydiscordlink/minecraft/listeners/LuckpermsEvents.java b/src/main/java/com/alttd/proxydiscordlink/minecraft/listeners/LuckpermsEvents.java
index 54cfc8a..69bd6e5 100644
--- a/src/main/java/com/alttd/proxydiscordlink/minecraft/listeners/LuckpermsEvents.java
+++ b/src/main/java/com/alttd/proxydiscordlink/minecraft/listeners/LuckpermsEvents.java
@@ -41,7 +41,7 @@ public class LuckpermsEvents {
         if (discordLinkPlayer == null)
             return;
 
-        discordLinkPlayer.updateMinecraft(List.of(optional.get()), added);
+        discordLinkPlayer.updateDiscord(List.of(optional.get()), added);
     }
 
 }
diff --git a/src/main/java/com/alttd/proxydiscordlink/objects/DiscordLinkPlayer.java b/src/main/java/com/alttd/proxydiscordlink/objects/DiscordLinkPlayer.java
index af3e65a..042138f 100644
--- a/src/main/java/com/alttd/proxydiscordlink/objects/DiscordLinkPlayer.java
+++ b/src/main/java/com/alttd/proxydiscordlink/objects/DiscordLinkPlayer.java
@@ -69,8 +69,6 @@ public class DiscordLinkPlayer {
             roles.stream().filter(DiscordRole::isUpdateToDiscord).forEach(role -> DiscordLink.getPlugin().getBot().addRole(userId, role.getId(), BotConfig.GUILD_ID)); //TODO test
         else
             roles.stream().filter(DiscordRole::isUpdateToDiscord).forEach(role -> DiscordLink.getPlugin().getBot().removeRole(userId, role.getId(), BotConfig.GUILD_ID)); //TODO test
-
-        DiscordLink.getPlugin().getDatabase().syncPlayer(this);
         //TODO implement
         //TODO SYNC ROLES TO DATABASE
     }
@@ -88,7 +86,6 @@ public class DiscordLinkPlayer {
                     user.data().remove(group);
             });
         });
-        DiscordLink.getPlugin().getDatabase().syncPlayer(this);
         //TODO implement
         //TODO SYNC ROLES TO DATABASE
     }