diff --git a/js/OAuthSimple.js b/js/OAuthSimple.js
index 7da164b..384b12b 100644
--- a/js/OAuthSimple.js
+++ b/js/OAuthSimple.js
@@ -280,19 +280,22 @@ if (OAuthSimple == null)
             for(var element=elements.shift();element;element=elements.shift())
             {
                 var keyToken=element.split('=');
+                var value='';
+                if (keyToken[1])
+                    value=decodeURIComponent(keyToken[1]);
                 if(result[keyToken[0]]){
                     if (!(result[keyToken[0]] instanceof Array))
                     {
-                        result[keyToken[0]] = Array(result[keyToken[0]],keyToken[1]);
+                        result[keyToken[0]] = Array(result[keyToken[0]],value);
                     }
                     else
                     {
-                        result[keyToken[0]].push(keyToken[1]);
+                        result[keyToken[0]].push(value);
                     }
                 }
                 else
                 {
-                    result[keyToken[0]]=keyToken[1];
+                    result[keyToken[0]]=value;
                 }
             }
             return result;
diff --git a/php/OAuthSimple.php b/php/OAuthSimple.php
index 9ce5bdf..44f5b1d 100644
--- a/php/OAuthSimple.php
+++ b/php/OAuthSimple.php
@@ -278,6 +278,8 @@ class OAuthSimple {
         foreach ($elements as $element)
         {
             list ($key,$token) = split('=',$element);
+            if ($token)
+                $token = urldecode($token);
             if (!empty($result[$key]))
             {
                 if (!is_array($result[$key]))