diff --git a/AUTHORS.md b/AUTHORS.md
index a14238764..91d8eee02 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -2,6 +2,7 @@
 
 ## Developers
 
+- Jigar Prajapati - <https://github.com/Jiggy9>
 - Roland Geider – <https://github.com/rolandgeider>
 - Dylan Aird - <https://github.com/Dolaned>
 - Jannik Norden - <https://github.com/Jannik-dev>
diff --git a/lib/screens/auth_screen.dart b/lib/screens/auth_screen.dart
index 27c006de2..e1dd7eb36 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 (value==null || value.isEmpty) {
+                        return AppLocalizations.of(context).invalidUsername;
+                      }
                       if (!RegExp(r'^[\w.@+-]+$').hasMatch(value!)) {
                         return AppLocalizations.of(context).usernameValidChars;
                       }
-                      if (value.isEmpty) {
-                        return AppLocalizations.of(context).invalidUsername;
-                      }
+                      
                       return null;
                     },
                     inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s\b|\b\s'))],