diff --git a/src/client/UsernameInput.ts b/src/client/UsernameInput.ts
index cfff06a1f..11889cd67 100644
--- a/src/client/UsernameInput.ts
+++ b/src/client/UsernameInput.ts
@@ -147,8 +147,8 @@ export class UsernameInput extends LitElement {
   }
 
   private validateAndStore() {
-    // Prevent empty username even if clan tag is present
-    if (!this.baseUsername.trim()) {
+    // Validate base username meets minimum length (clan tag doesn't count)
+    if (this.baseUsername.trim().length < MIN_USERNAME_LENGTH) {
       this._isValid = false;
       this.validationError = translateText("username.too_short", {
         min: MIN_USERNAME_LENGTH,