diff --git a/libreforms_fastapi/utils/config.py b/libreforms_fastapi/utils/config.py
index 049cc09..fd9ba2c 100644
--- a/libreforms_fastapi/utils/config.py
+++ b/libreforms_fastapi/utils/config.py
@@ -106,7 +106,7 @@ class Config(BaseSettings):
 
         @field_validator('TIMEZONE')
         def validate_timezone(cls, v):
-            # If it's already a ZoneInfo object, no need to re-validate
+            # If already a ZoneInfo object, no need to re-validate
             if isinstance(v, ZoneInfo):
                 return v
             # If it's a string, attempt to create a ZoneInfo object
@@ -125,8 +125,13 @@ def validate_timezone(cls, v):
 
         USERNAME_REGEX: str = os.getenv('USERNAME_REGEX', r"^\w\w\w\w+$")
         USERNAME_HELPER_TEXT: str = os.getenv('USERNAME_HELPER_TEXT', "Username must be 4-36 alphanumeric characters and underscores")
-        PASSWORD_REGEX: str = os.getenv('PASSWORD_REGEX', r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+[\]{};\'\\:"|,.<>/?])[A-Za-z\d!@#$%^&*()_+[\]{};\'\\:"|,.<>/?]{8,}$')
-        PASSWORD_HELPER_TEXT: str = os.getenv('PASSWORD_HELPER_TEXT', "Password must be 8+ characters, must include uppercase, lowercase, digit, and special character")
+        # PASSWORD_REGEX: str = os.getenv('PASSWORD_REGEX', r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+[\]{};\'\\:"|,.<>/?])[A-Za-z\d!@#$%^&*()_+[\]{};\'\\:"|,.<>/?]{8,}$')
+        # PASSWORD_HELPER_TEXT: str = os.getenv('PASSWORD_HELPER_TEXT', "Password must be 8+ characters, must include at least one uppercase letter, at least one lowercase letter, at least one number, and at least one of the following symbols: ! @ $ % & * ?")
+
+        # Improved in https://github.com/signebedi/libreforms-fastapi/issues/349
+        PASSWORD_REGEX: str = os.getenv('PASSWORD_REGEX', r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\[\]{};:\'",.<>/?\\|~`\-])[A-Za-z\d!@#$%^&*()_+\[\]{};:\'",.<>/?\\|~`\-]{8,}$')
+        PASSWORD_HELPER_TEXT: str = os.getenv('PASSWORD_HELPER_TEXT', "Password must be 8+ characters, include at least one uppercase letter, one lowercase letter, one number, and one symbol")
+
 
         # Here we allow the application to be run headlessly, but default to an enabled UI,
         # see https://github.com/signebedi/libreforms-fastapi/issues/18.