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.33 -r1.78.2.34
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	11 Nov 2016 17:05:32 -0000	1.78.2.33
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	22 Nov 2016 09:09:10 -0000	1.78.2.34
@@ -2173,7 +2173,7 @@
         @author Gustaf Neumann
     } {
         set cached_var_name ::$tokenname
-        if {[info exists $cached_var_name]} {
+        if {[info exists $cached_var_name] && [set $globalTokenName] ne ""} {
             return [set $cached_var_name]
         }
         
@@ -2263,7 +2263,7 @@
         # we compute it new.
         #
         set globalTokenName ::$tokenname
-        if {[info exists $globalTokenName]} {
+        if {[info exists $globalTokenName] && [set $globalTokenName] ne ""} {
             set token [set $globalTokenName]
         } else {
             set secret [ns_config "ns/server/[ns_info server]/acs" parametersecret ""]