diff --git a/lib/AccountManager/Tools.pm b/lib/AccountManager/Tools.pm
index 45c20a14216f8fc9f67042ab7624c33463e4dec5..e8292a6b77e5b9403b0e43f26e5b88f2e207780f 100644
--- a/lib/AccountManager/Tools.pm
+++ b/lib/AccountManager/Tools.pm
@@ -66,9 +66,10 @@ sub generate_password {
 # ID is based on time + PID
 sub generate_token {
     my ($salt, $size) = @_;
+    $salt = $PID unless $salt;
     $size = 20 unless $size;
 
-    return substr(Digest::MD5::md5_hex(time . $PID . $salt), -1 * $size);
+    return substr(Digest::MD5::md5_hex(time . $salt), -1 * $size);
 }
 
 ## Updates simpleSamlPhp authsources.php configuration file