2 files changed, 19 insertions, 6 deletions
diff --git a/app/assets/javascripts/pages/sessions/new/length_validator.js b/app/assets/javascripts/pages/sessions/new/length_validator.js
index 3d687ca08cc..92482c81f3c 100644
--- a/app/assets/javascripts/pages/sessions/new/length_validator.js
+++ b/app/assets/javascripts/pages/sessions/new/length_validator.js
@@ -21,11 +21,24 @@ export default class LengthValidator extends InputValidator {
     );
 
     const { value } = this.inputDomElement;
-    const { maxLengthMessage, maxLength } = this.inputDomElement.dataset;
-
-    this.errorMessage = maxLengthMessage;
-
-    this.invalidInput = value.length > parseInt(maxLength, 10);
+    const {
+      minLength,
+      minLengthMessage,
+      maxLengthMessage,
+      maxLength,
+    } = this.inputDomElement.dataset;
+
+    this.invalidInput = false;
+
+    if (value.length > parseInt(maxLength, 10)) {
+      this.invalidInput = true;
+      this.errorMessage = maxLengthMessage;
+    }
+
+    if (value.length < parseInt(minLength, 10)) {
+      this.invalidInput = true;
+      this.errorMessage = minLengthMessage;
+    }
 
     this.setValidationStateAndMessage();
   }
diff --git a/app/assets/javascripts/pages/sessions/new/username_validator.js b/app/assets/javascripts/pages/sessions/new/username_validator.js
index 1048e3b4548..ecb5e677290 100644
--- a/app/assets/javascripts/pages/sessions/new/username_validator.js
+++ b/app/assets/javascripts/pages/sessions/new/username_validator.js
@@ -39,7 +39,7 @@ export default class UsernameValidator extends InputValidator {
   static validateUsernameInput(inputDomElement) {
     const username = inputDomElement.value;
 
-    if (inputDomElement.checkValidity() && username.length > 0) {
+    if (inputDomElement.checkValidity() && username.length > 1) {
       UsernameValidator.setMessageVisibility(inputDomElement, pendingMessageSelector);
       UsernameValidator.fetchUsernameAvailability(username)
         .then(usernameTaken => {