diff --git a/tes/apiendpoints.py b/tes/apiendpoints.py
index d1f3cee9061b016ec4b83ca7669b567e0ffc287a..76ee535a119d23b61ed491995202f5186963b8d2 100644
--- a/tes/apiendpoints.py
+++ b/tes/apiendpoints.py
@@ -555,8 +555,9 @@ class CreateTunnel(Resource):
             else:
                 localbind = True
             sshsess = SSHSession.get_sshsession()
-            if 'authtok' in data:
-                authtok = data['authtok']
+            if 'token' in data:
+                authtok = data['token']
+                logger.debug('using token for authenticating tunnel')
             else:
                 authtok = gen_authtok()
             port,pids = Ssh.tunnel(sshsess, port=port, batchhost=batchhost,