diff --git a/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java b/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
index 8f09c7747..2b72b77c7 100644
--- a/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
+++ b/connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
@@ -56,9 +56,9 @@ public class SettingsCommand extends GeyserCommand {
                 }
             }
         }
-        if (session == null) return;
-        SettingsUtils.buildForm(session);
-        session.sendForm(session.getSettingsForm(), SettingsUtils.SETTINGS_FORM_ID);
+        if (session != null) {
+            session.sendForm(SettingsUtils.buildForm(session));
+        }
     }
 
     @Override
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java b/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
index 905245ee4..f864d022d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Charsets;
 import lombok.Getter;
-import org.geysermc.connector.utils.SkinProvider;
+import org.geysermc.connector.skin.SkinProvider;
 import org.geysermc.floodgate.util.DeviceOs;
 import org.geysermc.floodgate.util.InputMode;
 import org.geysermc.floodgate.util.RawSkin;