diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
new file mode 100644
index 00000000..060b34bf
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
@@ -0,0 +1,45 @@
+package icu.samnyan.aqua.net
+
+import ext.*
+import icu.samnyan.aqua.net.db.AquaNetUser
+import icu.samnyan.aqua.net.db.AquaNetUserRepo
+import icu.samnyan.aqua.net.utils.TurnstileService
+import io.ktor.client.request.*
+import jakarta.servlet.http.HttpServletRequest
+import org.springframework.security.crypto.password.PasswordEncoder
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/api/v2/user")
+class UserRegistrar(
+    val userRepo: AquaNetUserRepo,
+    val hasher: PasswordEncoder,
+    val turnstileService: TurnstileService
+) {
+    /**
+     * Register a new user
+     */
+    @PostMapping("/register")
+    fun register(@RP email: Str, @RP pass: Str, @RP captcha: Str?, request: HttpServletRequest) {
+        request.ip
+
+        // Check captcha
+        if (!turnstileService.validate(captcha,
+
+        // Check if email is valid
+        if (!email.isValidEmail()) 400 > "Invalid email"
+
+        // Check if user with the same email exists
+        if (userRepo.existsByEmail(email)) 400 > "User already exists"
+
+        // Validate password
+        if (pass.length < 8) 400 > "Password too short"
+
+        val u = AquaNetUser(email = email, pwHash = hasher.encode(pass), regTime = millis(), lastLogin = millis())
+        userRepo.save(u)
+
+        200 > "User created"
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/icu/samnyan/aqua/spring/configuration/Config.java b/src/main/java/icu/samnyan/aqua/spring/configuration/Config.java
index ef8d7543..757fee54 100644
--- a/src/main/java/icu/samnyan/aqua/spring/configuration/Config.java
+++ b/src/main/java/icu/samnyan/aqua/spring/configuration/Config.java
@@ -11,6 +11,8 @@ import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.net.URL;
 import java.util.Arrays;
@@ -33,6 +35,11 @@ public class Config {
         this.ENABLE_BILLING = ENABLE_BILLING;
     }
 
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
     @Bean
     public WebServerFactoryCustomizer<JettyServletWebServerFactory> webServerFactoryCustomizer() {