diff --git a/functions.sh b/functions.sh
index 3695fc3..2fb19b8 100755
--- a/functions.sh
+++ b/functions.sh
@@ -834,12 +834,14 @@ token(){
 
     [ -z "${P11M+x}" ] && { P11M=/usr/lib64/p11-kit-proxy.so; export P11M; }
 
+    tmppubkey="${XDG_RUNTIME_DIR}/token.pub"
+    loginfo "$(ssh-keygen -D $P11M >$tmppubkey)"
     # Usage:
     #   token <identity>                        will load token in agent. does nothing, if token is already loaded
     #   token -r|-f|--reload-token <identity>   will remove token from agent and add it again (if plugged off and plugged in again
 #    startagent -t $@
 #    loadagent $@
-    loginfo "$(ssh-add -s $P11M || { ssh-add -e $P11M; ssh-add -s $P11M; } )"
+    loginfo "$(ssh-add -T ${tmppubkey} || { ssh-add -e $P11M; ssh-add -s $P11M; } )"
     loginfo "$(ssh-add -l)"
 
 }