diff --git a/func/main.sh b/func/main.sh
index 3703c0af8..c5222d1b0 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -556,12 +556,7 @@ validate_format_email() {
 
 # Username
 validate_format_username() {
-    if ! [[ "$1" =~ ^[[:alnum:]]+([\.|_|-][[:alnum:]]+)?$ ]]; then
-        echo "Error: $2 $1 is not valid"
-        log_event "$E_INVALID" "$EVENT"
-        exit $E_INVALID
-    fi
-    if  [[ "${#1}" -gt 28 ]]; then
+    if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then
         echo "Error: $2 $1 is not valid"
         log_event "$E_INVALID" "$EVENT"
         exit $E_INVALID