diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 5f8a669b1..7920f1317 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -74,7 +74,7 @@ function onLoginCallback(http) {
 					&& !userName.endsWith(loginSuffix))
 				userName += loginSuffix;
 			var address = "" + window.location.href;
-			var baseAddress = ApplicationBaseURL + encodeURI(userName);
+			var baseAddress = ApplicationBaseURL + encodeURIComponent(userName);
 			var altBaseAddress;
 			if (baseAddress[0] == "/") {
 				var parts = address.split("/");