diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index e351dda85..517114e91 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -28,7 +28,7 @@ function onLoginClick(event) {
 				&& !userName.endsWith(loginSuffix))
 			userName += loginSuffix;
 		var url = $("connectForm").getAttribute("action");
-		var parameters = ("userName=" + encodeURI(userName) + "&password=" + encodeURI(password));
+		var parameters = ("userName=" + encodeURIComponent(userName) + "&password=" + encodeURIComponent(password));
 		document.cookie = "";
 		triggerAjaxRequest(url, onLoginCallback, null, parameters,
 											 { "Content-type": "application/x-www-form-urlencoded",