diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index e335ed67f..f69ab0622 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -61,7 +61,7 @@ function onLoginClick(event) {
     var password = $("password").value;
     var language = $("language");
 
-    if (userName.length > 0) {
+    if (userName.length > 0 && password.length > 0) {
         this.disabled = true;
         startAnimation($("animation"));