diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index 27c006de..d19e39f9 100644
--- a/lib/screens/auth_screen.dart
+++ b/lib/screens/auth_screen.dart
@@ -246,12 +246,13 @@ class _AuthCardState extends State<AuthCard> {
                     textInputAction: TextInputAction.next,
                     keyboardType: TextInputType.emailAddress,
                     validator: (value) {
-                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {
-                        return AppLocalizations.of(context).usernameValidChars;
-                      }
                       if (value.isEmpty) {
                         return AppLocalizations.of(context).invalidUsername;
                       }
+                      if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {
+                        return AppLocalizations.of(context).usernameValidChars;
+                      }
+                      
                       return null;
                     },
                     inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))],