Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.78.2.47 -r1.78.2.48
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	26 Mar 2017 15:05:39 -0000	1.78.2.47
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	26 Mar 2017 15:14:52 -0000	1.78.2.48
@@ -1043,7 +1043,7 @@
 
 } {
 
-    set cookie_value [ns_urldecode [ad_get_cookie -include_set_cookies $include_set_cookies $name]]
+    set cookie_value [ad_get_cookie -include_set_cookies $include_set_cookies $name]
     if { $cookie_value eq "" } {
         error "Cookie does not exist."
     }
@@ -1074,7 +1074,7 @@
 
 } {
 
-    set cookie_value [ns_urldecode [ad_get_cookie -include_set_cookies $include_set_cookies $name]]
+    set cookie_value [ad_get_cookie -include_set_cookies $include_set_cookies $name]
 
     if { $cookie_value eq "" } {
         error "Cookie does not exist."
@@ -1147,7 +1147,7 @@
     }
 
     set cookie_value [ad_sign -secret $secret -token_id $token_id -max_age $signature_max_age $value]
-    set data [ns_urlencode [list $value $cookie_value]]
+    set data [list $value $cookie_value]
 
     ad_set_cookie \
         -replace $replace \
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.140.2.61 -r1.140.2.62
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	4 Mar 2017 10:57:08 -0000	1.140.2.61
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	26 Mar 2017 15:14:52 -0000	1.140.2.62
@@ -1985,7 +1985,7 @@
                 if { [string tolower [ns_set key $headers $i]] eq "set-cookie" 
                      && [regexp "^$name=(\[^;\]*)" [ns_set value $headers $i] match value] 
                  } {
-                    return $value
+                    return [ns_urldecode $value]
                 }
             }
         }
@@ -2001,7 +2001,7 @@
             if { $value eq "\"\"" } {
                 set value ""
             }
-            return $value
+            return [ns_urldecode $value]
         }
 
         return $default
@@ -2083,7 +2083,7 @@
         if { $value eq "" } {
             set cookie "$name=\"\""
         } else {
-            set cookie "$name=$value"
+            set cookie "$name=[ns_urlencode $value]"
         }
 
         if { $path ne "" } {