diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
index 9b71350f..a85d0e89 100644
--- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
+++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
@@ -24,7 +24,7 @@ class UserRegistrar(
      */
     @PostMapping("/register")
     suspend fun register(@RP username: Str, @RP email: Str, @RP password: Str,
-                         @RP turnstile: Str?, request: HttpServletRequest) {
+                         @RP turnstile: Str, request: HttpServletRequest) {
         val ip = geoIP.getIP(request)
 
         // Check captcha
@@ -34,7 +34,8 @@ class UserRegistrar(
         if (!email.isValidEmail()) 400 > "Invalid email"
 
         // Check if user with the same email exists
-        if (async { userRepo.existsByEmail(email) }) 400 > "User with email `$email` already exists"
+        if (async { userRepo.findByEmailIgnoreCase(email) != null })
+            400 > "User with email `$email` already exists"
 
         // Check if username is valid
         if (username.length < 2) 400 > "Username must be at least 2 letters"
@@ -48,7 +49,8 @@ class UserRegistrar(
         }
 
         // Check if user with the same username exists
-        if (async { userRepo.existsByUsername(username) }) 400 > "User with username `$username` already exists"
+        if (async { userRepo.findByUsernameIgnoreCase(username) != null })
+            400 > "User with username `$username` already exists"
 
         // Validate password
         if (password.length < 8) 400 > "Password must be at least 8 characters"
diff --git a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
index f7a3c465..37510d2f 100644
--- a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
+++ b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
@@ -10,7 +10,7 @@ import java.io.Serializable
 @Table(name = "aqua_net_user")
 class AquaNetUser(
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-    var auId: Int = 0,
+    var auId: Long = 0,
 
     @Column(nullable = false, unique = true, length = 32)
     var username: String = "",
@@ -43,7 +43,8 @@ class AquaNetUser(
 ) : Serializable
 
 @Repository("AquaNetUserRepository")
-interface AquaNetUserRepo : JpaRepository<AquaNetUser, Int> {
-    fun existsByEmail(email: String): Boolean
-    fun existsByUsername(username: String): Boolean
+interface AquaNetUserRepo : JpaRepository<AquaNetUser, Long> {
+    fun findByAuId(auId: Long): AquaNetUser?
+    fun findByEmailIgnoreCase(email: String): AquaNetUser?
+    fun findByUsernameIgnoreCase(username: String): AquaNetUser?
 }
\ No newline at end of file