diff --git a/config/application.properties b/config/application.properties
index d4ed8e9a..aa9dd9b2 100644
--- a/config/application.properties
+++ b/config/application.properties
@@ -91,11 +91,14 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.community.dialect.SQLiteDi
 
 ## CloudFlare Turnstile Captcha
 ## This enables captcha for user registration.
-turnstile.enable=false
-turnstile.secret=1x0000000000000000000000000000000AA
-turnstile.ip-header=CF-Connecting-IP
+aqua-net.turnstile.enable=false
+aqua-net.turnstile.secret=1x0000000000000000000000000000000AA
+aqua-net.turnstile.ip-header=CF-Connecting-IP
 
 ## Email Settings
+aqua-net.email.enable=false
+aqua-net.email.senderName=AquaDX
+aqua-net.email.senderAddr=you@example.com
 simplejavamail.javaxmail.debug=false
 simplejavamail.smtp.host=smtp.production.host
 simplejavamail.smtp.port=443
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/Email.kt b/src/main/java/icu/samnyan/aqua/net/utils/Email.kt
new file mode 100644
index 00000000..f415c579
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/net/utils/Email.kt
@@ -0,0 +1,22 @@
+package icu.samnyan.aqua.net.utils
+
+import ext.Bool
+import ext.Str
+import icu.samnyan.aqua.net.db.AquaNetUser
+import org.simplejavamail.api.mailer.Mailer
+import org.simplejavamail.email.EmailBuilder
+import org.simplejavamail.springsupport.SimpleJavaMailSpringSupport
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
+import org.springframework.stereotype.Service
+
+@Configuration
+@ConfigurationProperties(prefix = "aqua-net.email")
+class EmailProperties {
+    var enable: Bool = false
+
+    lateinit var senderName: Str
+
+    lateinit var senderAddr: Str
+}
diff --git a/src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt b/src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt
index 2bd06096..4ca24e57 100644
--- a/src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt
+++ b/src/main/java/icu/samnyan/aqua/net/utils/Turnstile.kt
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.stereotype.Service
 
 @Configuration
-@ConfigurationProperties(prefix = "turnstile")
+@ConfigurationProperties(prefix = "aqua-net.turnstile")
 class TurnstileProperties {
     var enable: Bool = false