diff --git a/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt b/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt
index 5e1a3b8..5743eb4 100644
--- a/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt
+++ b/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt
@@ -1,10 +1,8 @@
 package com.infendro.account.dto.request
 
-import com.infendro.account.util.REGEX_PASSWORD
-import com.infendro.account.util.REGEX_USERNAME
-import io.ktor.server.plugins.requestvalidation.RequestValidationConfig
-import io.ktor.server.plugins.requestvalidation.ValidationResult.Invalid
-import io.ktor.server.plugins.requestvalidation.ValidationResult.Valid
+import com.infendro.account.util.REGEX
+import io.ktor.server.plugins.requestvalidation.*
+import io.ktor.server.plugins.requestvalidation.ValidationResult.*
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -22,8 +20,8 @@ data class PostAccountRequestAccess(
 fun RequestValidationConfig.validatePostAccountRequest() {
     validate<PostAccountRequest> { request ->
         when {
-            !REGEX_USERNAME.matches(request.username) -> Invalid("")
-            !REGEX_PASSWORD.matches(request.password) -> Invalid("")
+            !REGEX.USERNAME.matches(request.username) -> Invalid("")
+            !REGEX.PASSWORD.matches(request.password) -> Invalid("")
             else -> Valid
         }
     }
diff --git a/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentPasswordRequest.kt b/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentPasswordRequest.kt
index 75ee60b..739d884 100644
--- a/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentPasswordRequest.kt
+++ b/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentPasswordRequest.kt
@@ -1,6 +1,6 @@
 package com.infendro.account.dto.request
 
-import com.infendro.account.util.REGEX_PASSWORD
+import com.infendro.account.util.REGEX
 import io.ktor.server.plugins.requestvalidation.*
 import io.ktor.server.plugins.requestvalidation.ValidationResult.*
 import kotlinx.serialization.Serializable
@@ -14,7 +14,7 @@ data class PutAccountCurrentPasswordRequest(
 fun RequestValidationConfig.validatePutAccountCurrentPasswordRequest() {
     validate<PutAccountCurrentPasswordRequest> { request ->
         when {
-            !REGEX_PASSWORD.matches(request.password) -> Invalid("")
+            !REGEX.PASSWORD.matches(request.password) -> Invalid("")
             else -> Valid
         }
     }
diff --git a/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentUsernameRequest.kt b/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentUsernameRequest.kt
index b5aaecb..68ff665 100644
--- a/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentUsernameRequest.kt
+++ b/backend/src/main/kotlin/com/infendro/account/dto/request/PutAccountCurrentUsernameRequest.kt
@@ -1,6 +1,6 @@
 package com.infendro.account.dto.request
 
-import com.infendro.account.util.REGEX_USERNAME
+import com.infendro.account.util.REGEX
 import io.ktor.server.plugins.requestvalidation.*
 import io.ktor.server.plugins.requestvalidation.ValidationResult.*
 import kotlinx.serialization.Serializable
@@ -14,7 +14,7 @@ data class PutAccountCurrentUsernameRequest(
 fun RequestValidationConfig.validatePutAccountCurrentUsernameRequest() {
     validate<PutAccountCurrentUsernameRequest> { request ->
         when {
-            !REGEX_USERNAME.matches(request.username) -> Invalid("")
+            !REGEX.USERNAME.matches(request.username) -> Invalid("")
             else -> Valid
         }
     }
diff --git a/backend/src/main/kotlin/com/infendro/account/util/Regex.kt b/backend/src/main/kotlin/com/infendro/account/util/Regex.kt
index df1b23a..ece9fe1 100644
--- a/backend/src/main/kotlin/com/infendro/account/util/Regex.kt
+++ b/backend/src/main/kotlin/com/infendro/account/util/Regex.kt
@@ -1,4 +1,6 @@
 package com.infendro.account.util
 
-val REGEX_USERNAME = """^(?=.{1,32}$)[a-z0-9]+([\-._][a-z0-9]+)*$""".toRegex()
-val REGEX_PASSWORD = """^(?=.{8,}$)[a-zA-Z0-9!"#$%&'()*+,\-./:;<=>?@\[\\\]^_`{|}~]*$""".toRegex()
+object REGEX {
+    val USERNAME = """^(?=.{1,32}$)[a-z0-9]+([\-._][a-z0-9]+)*$""".toRegex()
+    val PASSWORD = """^(?=.{8,}$)[a-zA-Z0-9!"#$%&'()*+,\-./:;<=>?@\[\\\]^_`{|}~]*$""".toRegex()
+}