diff --git a/dbal/ts/src/core/entities/validation/user-validation.ts b/dbal/ts/src/core/entities/validation/user-validation.ts
index feedb375b..7167aaad1 100644
--- a/dbal/ts/src/core/entities/validation/user-validation.ts
+++ b/dbal/ts/src/core/entities/validation/user-validation.ts
@@ -2,20 +2,8 @@
  * @file user-validation.ts
  * @description User validation functions
  */
+import { isValidEmail } from '../../validation/is-valid-email'
+import { isValidUsername } from '../../validation/is-valid-username'
 
-const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-const USERNAME_REGEX = /^[a-z0-9_-]{3,30}$/;
-
-/**
- * Validate email format
- */
-export function validateEmail(email: string): boolean {
-  return EMAIL_REGEX.test(email);
-}
-
-/**
- * Validate username format
- */
-export function validateUsername(username: string): boolean {
-  return USERNAME_REGEX.test(username);
-}
+export const validateEmail = (email: string): boolean => isValidEmail(email)
+export const validateUsername = (username: string): boolean => isValidUsername(username)