diff --git a/4chan_x.js b/4chan_x.js
index e35050d47..8f4ddb955 100644
--- a/4chan_x.js
+++ b/4chan_x.js
@@ -1153,10 +1153,10 @@
       challenge = $('input[name=recaptcha_challenge_field]').value;
       src = "http://www.google.com/recaptcha/api/image?c=" + challenge;
       c = d.cookie;
-      name = (m = c.match(/4chan_name=([^;]+)/)) ? unescape(m[1]) : '';
-      mail = (m = c.match(/4chan_email=([^;]+)/)) ? unescape(m[1]) : '';
-      pass = (m = c.match(/4chan_pass=([^;]+)/)) ? unescape(m[1]) : $('input[name=pwd]').value;
-      html = "      <div class=move>        <input class=inputtext type=text name=name placeholder=Name form=qr_form value='" + name + "'>        Quick Reply        <input type=checkbox id=autohide title=autohide>        <a name=close title=close>X</a>      </div>      <form name=post action=http://sys.4chan.org/" + g.BOARD + "/post method=POST enctype=multipart/form-data target=iframe id=qr_form>        <input type=hidden name=MAX_FILE_SIZE value=" + MAX_FILE_SIZE + ">        <input type=hidden name=resto value=" + THREAD_ID + ">        <input type=hidden name=recaptcha_challenge_field value=" + challenge + ">        <div><input class=inputtext type=text name=email placeholder=E-mail value='" + mail + "'></div>        <div><input class=inputtext type=text name=sub placeholder=Subject><input type=submit value=" + submitValue + " id=com_submit " + submitDisabled + "></div>        <div><textarea class=inputtext name=com placeholder=Comment></textarea></div>        <div><img src=" + src + "></div>        <div><input class=inputtext type=text name=recaptcha_response_field placeholder=Verification required autocomplete=off></div>        <div><input type=file name=upfile></div>        <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password value='" + pass + "'><input type=hidden name=mode value=regist></div>      </form>      <div id=error class=error></div>      ";
+      name = (m = c.match(/4chan_name=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
+      mail = (m = c.match(/4chan_email=([^;]+)/)) ? decodeURIComponent(m[1]) : '';
+      pass = (m = c.match(/4chan_pass=([^;]+)/)) ? decodeURIComponent(m[1]) : $('input[name=pwd]').value;
+      html = "      <div class=move>        <input class=inputtext type=text name=name placeholder=Name form=qr_form value=\"" + name + "\">        Quick Reply        <input type=checkbox id=autohide title=autohide>        <a name=close title=close>X</a>      </div>      <form name=post action=http://sys.4chan.org/" + g.BOARD + "/post method=POST enctype=multipart/form-data target=iframe id=qr_form>        <input type=hidden name=MAX_FILE_SIZE value=" + MAX_FILE_SIZE + ">        <input type=hidden name=resto value=" + THREAD_ID + ">        <input type=hidden name=recaptcha_challenge_field value=" + challenge + ">        <div><input class=inputtext type=text name=email placeholder=E-mail value=\"" + mail + "\"></div>        <div><input class=inputtext type=text name=sub placeholder=Subject><input type=submit value=" + submitValue + " id=com_submit " + submitDisabled + "></div>        <div><textarea class=inputtext name=com placeholder=Comment></textarea></div>        <div><img src=" + src + "></div>        <div><input class=inputtext type=text name=recaptcha_response_field placeholder=Verification required autocomplete=off></div>        <div><input type=file name=upfile></div>        <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password value=\"" + pass + "\"><input type=hidden name=mode value=regist></div>      </form>      <div id=error class=error></div>      ";
       dialog = ui.dialog('qr', {
         top: '0px',
         left: '0px'
diff --git a/script.coffee b/script.coffee
index d85d04d1f..35c78cf4e 100644
--- a/script.coffee
+++ b/script.coffee
@@ -910,12 +910,12 @@ qr =
     challenge = $('input[name=recaptcha_challenge_field]').value
     src = "http://www.google.com/recaptcha/api/image?c=#{challenge}"
     c = d.cookie
-    name = if m = c.match(/4chan_name=([^;]+)/)  then unescape m[1] else ''
-    mail = if m = c.match(/4chan_email=([^;]+)/) then unescape m[1] else ''
-    pass = if m = c.match(/4chan_pass=([^;]+)/)  then unescape m[1] else $('input[name=pwd]').value
+    name = if m = c.match(/4chan_name=([^;]+)/)  then decodeURIComponent m[1] else ''
+    mail = if m = c.match(/4chan_email=([^;]+)/) then decodeURIComponent m[1] else ''
+    pass = if m = c.match(/4chan_pass=([^;]+)/)  then decodeURIComponent m[1] else $('input[name=pwd]').value
     html = "
       <div class=move>
-        <input class=inputtext type=text name=name placeholder=Name form=qr_form value='#{name}'>
+        <input class=inputtext type=text name=name placeholder=Name form=qr_form value=\"#{name}\">
         Quick Reply
         <input type=checkbox id=autohide title=autohide>
         <a name=close title=close>X</a>
@@ -924,13 +924,13 @@ qr =
         <input type=hidden name=MAX_FILE_SIZE value=#{MAX_FILE_SIZE}>
         <input type=hidden name=resto value=#{THREAD_ID}>
         <input type=hidden name=recaptcha_challenge_field value=#{challenge}>
-        <div><input class=inputtext type=text name=email placeholder=E-mail value='#{mail}'></div>
+        <div><input class=inputtext type=text name=email placeholder=E-mail value=\"#{mail}\"></div>
         <div><input class=inputtext type=text name=sub placeholder=Subject><input type=submit value=#{submitValue} id=com_submit #{submitDisabled}></div>
         <div><textarea class=inputtext name=com placeholder=Comment></textarea></div>
         <div><img src=#{src}></div>
         <div><input class=inputtext type=text name=recaptcha_response_field placeholder=Verification required autocomplete=off></div>
         <div><input type=file name=upfile></div>
-        <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password value='#{pass}'><input type=hidden name=mode value=regist></div>
+        <div><input class=inputtext type=password name=pwd maxlength=8 placeholder=Password value=\"#{pass}\"><input type=hidden name=mode value=regist></div>
       </form>
       <div id=error class=error></div>
       "