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 -r1.78.2.7 -r1.78.2.8
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	2 Jan 2016 20:42:58 -0000	1.78.2.7
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	23 Feb 2016 13:51:30 -0000	1.78.2.8
@@ -828,12 +828,12 @@
 
     @param value the value to be signed.
 } {
+    if {$token_id eq ""} { 
+        # pick a random token_id
+        set token_id [sec_get_random_cached_token_id]
+    }
 
     if { $secret eq "" } {
-        if {$token_id eq ""} { 
-            # pick a random token_id
-            set token_id [sec_get_random_cached_token_id]
-        }
         set secret_token [sec_get_token $token_id]
     } else {
         set secret_token $secret
@@ -849,7 +849,6 @@
     }
 
     set hash [ns_sha1 "$value$token_id$expire_time$secret_token"]
-
     set signature [list $token_id $expire_time $hash]
 
     return $signature