diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 27f888121..5dcdac38a 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -43,12 +43,16 @@ function initLogin() {
 }
 
 function onFieldKeyDown(event) {
-    if (event.keyCode == Event.KEY_RETURN)
+    if (event.keyCode == Event.KEY_RETURN) {
         if ($("password").value.length > 0
             && $("userName").value.length > 0)
             return onLoginClick (event);
         else
             Event.stop(event);
+    } else if (IsCharacterKey(event.keyCode)
+               || event.keyCode == Event.KEY_BACKSPACE) {
+        SetLogMessage("errorMessage", null);
+    }
 }
 
 function onLoginClick(event) {
@@ -58,7 +62,6 @@ function onLoginClick(event) {
     var language = $("language");
 
     if (userName.length > 0) {
-        SetLogMessage("errorMessage", null);
         this.disabled = true;
         startAnimation($("animation"));