diff --git a/static/js/pad2.js b/static/js/pad2.js
index b79ff8b9..b649ae1d 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -80,7 +80,7 @@ function getParams()
 {
   var showControls = getUrlVars()["showControls"];
   var showChat = getUrlVars()["showChat"];
-  var userName = getUrlVars()["userName"];
+  var userName = unescape(getUrlVars()["userName"]);
   var showLineNumbers = getUrlVars()["showLineNumbers"];
   var useMonospaceFont = getUrlVars()["useMonospaceFont"];
   if(showControls)
@@ -245,6 +245,7 @@ function handshake()
       if (globalUserName !== false)
       {
         pad.notifyChangeName(globalUserName); // Notifies the server
+	pad.myUserInfo.name = globalUserName;
         $('#myusernameedit').attr({"value":globalUserName}); // Updates the current users UI
       }
     }