diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 28ea18e7a..c20669e21 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -1,8 +1,13 @@
 function initLogin() {
+  var date = new Date();
+  date.setTime(date.getTime() - 86400000);
+  document.cookie = ("0xHIGHFLYxSOGo-0.9=discard; path=/"
+		     + "; expires=" + date.toGMTString());
   var submit = $("submit");
+  Event.observe(submit, "click", onLoginClick);
+
   var userName = $("userName");
   userName.focus();
-  Event.observe(submit, "click", onLoginClick);
 
   var image = $("preparedAnimation");
   image.parentNode.removeChild(image);
@@ -11,9 +16,26 @@ function initLogin() {
 function onLoginClick(event) {
   startAnimation($("loginButton"), $("submit"));
 
-  var loginString = $("userName").value + ":" + $("password").value;
-  document.cookie = ("0xHIGHFLYxSOGo-0.9 = basic" + loginString.base64encode()
-		     + "; path=/");
+  var userName = $("userName").value;
+  var password = $("password").value;
+
+  if (userName.length > 0) {
+    var url = ($("connectForm").getAttribute("action")
+	       + "?userName=" + userName
+	       + "&password=" + password);
+    document.cookie = "";
+    triggerAjaxRequest(url, onLoginCallback);
+  }
+
+  event.preventDefault();
+}
+
+function onLoginCallback(http) {
+  if (http.readyState == 4) {
+    if (http.status == 204) {
+      window.location.href = ApplicationBaseURL + $("userName").value;
+    }
+  }
 }
 
 addEvent(window, 'load', initLogin);