diff --git a/tetawebapp/static/scripts/tetawebapp.js b/tetawebapp/static/scripts/tetawebapp.js
index 8390650..d1e95b5 100644
--- a/tetawebapp/static/scripts/tetawebapp.js
+++ b/tetawebapp/static/scripts/tetawebapp.js
@@ -50,11 +50,18 @@ function valid_input(obj) {
 
 function verify_login() {
   // Verify login inputs
-  login = document.getElementById('login').value;
-  password = document.getElementById('password').value;
-  if (login.length > 0 && password.length > 0) {
-    return true;
+  login = document.getElementById('login');
+  password = document.getElementById('password');
+  if (login.value.length > 0) {
+    valid_input(login);
+    if (password.value.length > 0) {
+      valid_input(password);
+      return true;
+    }
+    invalid_input(password);
+    return false;
   }
+  invalid_input(login);
   return false;
 }