diff --git a/Playvoi.Client/Assets/_Hub/Scripts/UI/LoginUI.cs b/Playvoi.Client/Assets/_Hub/Scripts/UI/LoginUI.cs
index d704b95..e295212 100644
--- a/Playvoi.Client/Assets/_Hub/Scripts/UI/LoginUI.cs
+++ b/Playvoi.Client/Assets/_Hub/Scripts/UI/LoginUI.cs
@@ -60,15 +60,29 @@ namespace _Hub.Scripts.UI
                                 (_maxUsernameLength >= _username.Length && _maxPasswordLength >= _password.Length) &&
                                 usernameRegex.Success);
             EnableLoginButton(interactable);
-            
+
+            UpdateInputErrors(usernameRegex);
+        }
+
+        private void UpdateInputErrors(Match usernameRegex)
+        {
             //Username
-            if (_username != null)
+            if (string.IsNullOrEmpty(_username))
+            {
+                usernameInputField.Error(false);
+            }
+            else
             {
                 var usernameTooLong = _username.Length > _maxUsernameLength;
-                usernameInputField.Error(usernameTooLong);
+                usernameInputField.Error(usernameTooLong || !usernameRegex.Success);
             }
+
             //Password
-            if (_password != null )
+            if (string.IsNullOrEmpty(_password))
+            {
+                usernameInputField.Error(false);
+            }
+            else
             {
                 var passwordTooLong = _password.Length > _maxPasswordLength;
                 passwordInputField.Error(passwordTooLong);