diff --git a/static/js/pad2.js b/static/js/pad2.js
index 9df57ae8..394eb4c7 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -81,7 +81,7 @@ function getParams()
 {
   var showControls = getUrlVars()["showControls"];
   var showChat = getUrlVars()["showChat"];
-  var userName = unescape(getUrlVars()["userName"]);
+  var userName = getUrlVars()["userName"];
   var showLineNumbers = getUrlVars()["showLineNumbers"];
   var useMonospaceFont = getUrlVars()["useMonospaceFont"];
   var IsnoColors = getUrlVars()["noColors"];
@@ -130,7 +130,7 @@ function getParams()
   if(userName)
   {
     // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
-    globalUserName = userName;
+    globalUserName = unescape(userName);
   }
 }