diff --git a/src/sunstone/public/js/opennebula.js b/src/sunstone/public/js/opennebula.js
index fcf9378390..878e005170 100644
--- a/src/sunstone/public/js/opennebula.js
+++ b/src/sunstone/public/js/opennebula.js
@@ -453,7 +453,7 @@ var OpenNebula = {
                     var token = username + ':' + password;
                     var authString = 'Basic ';
                     if (typeof(btoa) === 'function')
-                        authString += btoa(token)
+                        authString += btoa(unescape(encodeURIComponent( token )))
                     else {
                         token = CryptoJS.enc.Utf8.parse(token);
                         authString += CryptoJS.enc.Base64.stringify(token)
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index c69f194524..f4428e098a 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -478,7 +478,7 @@ function setLogin(){
     };
 
     var user_login_content =  '<div href="#" class="button tiny secondary dropdown" id="logout">\
-      <i class="icon-user header-icon"></i> '+ username + '\
+      <i class="icon-user header-icon"></i> '+ decodeURIComponent(username) + '\
       <ul>\
         <li><a href="#" class="configuration"><i class="icon-cog"></i> Settings</a></li>\
         <li><a href="#" class="logout"><i class="icon-off"></i> Sign Out</a></li>\